bugfix maintenance release 6.0.1 6.0
authorchris
Fri, 28 Apr 2017 13:32:00 +0200
branch6.0
changeset 24856f849b377b1
parent 247 936a62069080
child 249 dd84160d1db5
bugfix maintenance release 6.0.1
colibriweb/pom.xml
colibriweb/src/main/java/com/proclos/colibriweb/session/modules/component/ComponentModule.java
colibriweb/src/main/java/com/proclos/colibriweb/session/modules/component/TransformModule.java
colibriweb/webapp/modules/common/componentEditorEditPart.xhtml
colibriweb/webapp/modules/connection/edit.xhtml
colibriweb/webapp/modules/extract/edit.xhtml
colibriweb/webapp/modules/job/edit.xhtml
colibriweb/webapp/modules/load/edit.xhtml
colibriweb/webapp/modules/transform/edit.xhtml
pom.xml
     1.1 --- a/colibriweb/pom.xml	Fri Nov 11 08:48:46 2016 +0100
     1.2 +++ b/colibriweb/pom.xml	Fri Apr 28 13:32:00 2017 +0200
     1.3 @@ -288,11 +288,7 @@
     1.4  			<groupId>org.hibernate</groupId>
     1.5  			<artifactId>hibernate-validator</artifactId>
     1.6  		</dependency>
     1.7 -		
     1.8 -		<dependency>
     1.9 -			<groupId>org.hibernate</groupId>
    1.10 -			<artifactId>hibernate-jmx</artifactId>
    1.11 -		</dependency>
    1.12 +	
    1.13  		<dependency>
    1.14  			<groupId>org.jdom</groupId>
    1.15  			<artifactId>jdom</artifactId>
     2.1 --- a/colibriweb/src/main/java/com/proclos/colibriweb/session/modules/component/ComponentModule.java	Fri Nov 11 08:48:46 2016 +0100
     2.2 +++ b/colibriweb/src/main/java/com/proclos/colibriweb/session/modules/component/ComponentModule.java	Fri Apr 28 13:32:00 2017 +0200
     2.3 @@ -1928,6 +1928,7 @@
     2.4  				}
     2.5  			}
     2.6  		}
     2.7 +		inputList = null;
     2.8  	}
     2.9  
    2.10  	@Override
     3.1 --- a/colibriweb/src/main/java/com/proclos/colibriweb/session/modules/component/TransformModule.java	Fri Nov 11 08:48:46 2016 +0100
     3.2 +++ b/colibriweb/src/main/java/com/proclos/colibriweb/session/modules/component/TransformModule.java	Fri Apr 28 13:32:00 2017 +0200
     3.3 @@ -112,7 +112,6 @@
     3.4  		for (Function f : getInstance().getFunctions()) {
     3.5  			if (!names.contains(f.getName())) {
     3.6  				ComponentOutput fo = new ComponentOutput();
     3.7 -				fo.setId(new Long(0));
     3.8  				fo.setName(f.getName());
     3.9  				String type = f.getOutputType();
    3.10  				fo.setType(type);
    3.11 @@ -180,7 +179,7 @@
    3.12  		Iterator<ComponentOutput> iterator = inputs.iterator();
    3.13  		while (iterator.hasNext()) {
    3.14  			ComponentOutput o = iterator.next();
    3.15 -			if (o.getName().equals(f.getName()) && o.getId().longValue() == 0) {
    3.16 +			if (o.getName().equals(f.getName()) && (o.getId() == null || o.getId().longValue() == 0)) {
    3.17  				iterator.remove();
    3.18  			}
    3.19  		}
     4.1 --- a/colibriweb/webapp/modules/common/componentEditorEditPart.xhtml	Fri Nov 11 08:48:46 2016 +0100
     4.2 +++ b/colibriweb/webapp/modules/common/componentEditorEditPart.xhtml	Fri Apr 28 13:32:00 2017 +0200
     4.3 @@ -26,9 +26,9 @@
     4.4  					        </p:selectOneMenu> 
     4.5  						</s:decorate>
     4.6  						<s:decorate template="/layout/fieldvalidation.xhtml" rendered="#{field.holdsConstantInput}" style="float:left;">
     4.7 -							<h:inputText value="#{field.attributes.get('constant').value}" styleClass="inputfield" style="width:130px;" required="false">
     4.8 +							<p:inputText value="#{field.attributes.get('constant').value}" styleClass="inputfield" style="width:130px;" required="false">
     4.9  								<p:ajax global="false" process="@this" event="change"/> 
    4.10 -							</h:inputText>
    4.11 +							</p:inputText>
    4.12  						</s:decorate>
    4.13  						<p:commandLink style="float:left" global="false" title="Source Input" action="#{field.setHoldsConstantInput(true)}" update="input" process="@this input" rendered="#{not field.holdsConstantInput and not empty field.attributes.get('constant')}" immediate="true">
    4.14  							 <p:graphicImage value="/img/next.png" width="16" height="16" />
     5.1 --- a/colibriweb/webapp/modules/connection/edit.xhtml	Fri Nov 11 08:48:46 2016 +0100
     5.2 +++ b/colibriweb/webapp/modules/connection/edit.xhtml	Fri Apr 28 13:32:00 2017 +0200
     5.3 @@ -128,12 +128,10 @@
     5.4  		<ui:include src="/elements/flowgraph.xhtml">
     5.5  			<ui:param name="module" value="#{connectionModule}"/>
     5.6  		</ui:include>
     5.7 -		<s:fragment rendered="#{not empty connectionModule.instance.id}">
     5.8 +		<h:panelGroup id="sockets">
     5.9  			<ui:include src="/modules/common/cloneComponent.xhtml">
    5.10  				<ui:param name="module" value="#{connectionModule}"/>
    5.11  			</ui:include>
    5.12 -		</s:fragment>
    5.13 -		<h:panelGroup id="sockets">
    5.14  			<p:socket channel="/log/#{connectionModule.pushId}" onMessage="handleMessage"> 
    5.15  			</p:socket>
    5.16  			<p:socket channel="/completed/#{connectionModule.pushId}"> 
     6.1 --- a/colibriweb/webapp/modules/extract/edit.xhtml	Fri Nov 11 08:48:46 2016 +0100
     6.2 +++ b/colibriweb/webapp/modules/extract/edit.xhtml	Fri Apr 28 13:32:00 2017 +0200
     6.3 @@ -148,12 +148,10 @@
     6.4  		<ui:include src="/elements/flowgraph.xhtml">
     6.5  			<ui:param name="module" value="#{extractModule}"/>
     6.6  		</ui:include>
     6.7 -		<s:fragment rendered="#{not empty extractModule.instance.id}">
     6.8 +		<h:panelGroup id="sockets">
     6.9  			<ui:include src="/modules/common/cloneComponent.xhtml">
    6.10  				<ui:param name="module" value="#{extractModule}"/>
    6.11  			</ui:include>
    6.12 -		</s:fragment>  
    6.13 -		<h:panelGroup id="sockets">
    6.14  			<p:socket channel="/log/#{extractModule.pushId}" onMessage="handleMessage"> 
    6.15  			</p:socket>
    6.16  			<p:socket channel="/completed/#{extractModule.pushId}"> 
     7.1 --- a/colibriweb/webapp/modules/job/edit.xhtml	Fri Nov 11 08:48:46 2016 +0100
     7.2 +++ b/colibriweb/webapp/modules/job/edit.xhtml	Fri Apr 28 13:32:00 2017 +0200
     7.3 @@ -183,12 +183,10 @@
     7.4  		<ui:include src="/elements/flowgraph.xhtml">
     7.5  			<ui:param name="module" value="#{jobModule}"/>
     7.6  		</ui:include>
     7.7 -		<s:fragment rendered="#{not empty jobModule.instance.id}">
     7.8 +		<h:panelGroup id="sockets">
     7.9  			<ui:include src="/modules/common/cloneComponent.xhtml">
    7.10  				<ui:param name="module" value="#{jobModule}"/>
    7.11  			</ui:include>
    7.12 -		</s:fragment>
    7.13 -		<h:panelGroup id="sockets">
    7.14  			<p:socket channel="/log/#{jobModule.pushId}" onMessage="handleMessage"> 
    7.15  			</p:socket>
    7.16  			<p:socket channel="/completed/#{jobModule.pushId}"> 
     8.1 --- a/colibriweb/webapp/modules/load/edit.xhtml	Fri Nov 11 08:48:46 2016 +0100
     8.2 +++ b/colibriweb/webapp/modules/load/edit.xhtml	Fri Apr 28 13:32:00 2017 +0200
     8.3 @@ -181,12 +181,10 @@
     8.4  		<ui:include src="/elements/flowgraph.xhtml">
     8.5  			<ui:param name="module" value="#{loadModule}"/>
     8.6  		</ui:include>
     8.7 -		<s:fragment rendered="#{not empty loadModule.instance.id}">
     8.8 +		<h:panelGroup id="sockets">
     8.9  			<ui:include src="/modules/common/cloneComponent.xhtml">
    8.10  				<ui:param name="module" value="#{loadModule}"/>
    8.11  			</ui:include>
    8.12 -		</s:fragment>
    8.13 -		<h:panelGroup id="sockets">
    8.14  			<p:socket channel="/log/#{loadModule.pushId}" onMessage="handleMessage" autoConnect="true"> 
    8.15  			</p:socket>
    8.16  			<p:socket channel="/completed/#{loadModule.pushId}"> 
     9.1 --- a/colibriweb/webapp/modules/transform/edit.xhtml	Fri Nov 11 08:48:46 2016 +0100
     9.2 +++ b/colibriweb/webapp/modules/transform/edit.xhtml	Fri Apr 28 13:32:00 2017 +0200
     9.3 @@ -158,12 +158,10 @@
     9.4  		<ui:include src="/elements/flowgraph.xhtml">
     9.5  			<ui:param name="module" value="#{transformModule}"/>
     9.6  		</ui:include>
     9.7 -		<s:fragment rendered="#{not empty transformModule.instance.id}">
     9.8 +		<h:panelGroup id="sockets">
     9.9  			<ui:include src="/modules/common/cloneComponent.xhtml">
    9.10  				<ui:param name="module" value="#{transformModule}"/>
    9.11  			</ui:include>
    9.12 -		</s:fragment>
    9.13 -		<h:panelGroup id="sockets">
    9.14  			<p:socket channel="/log/#{transformModule.pushId}" onMessage="handleMessage"> 
    9.15  			</p:socket>
    9.16  			<p:socket channel="/completed/#{transformModule.pushId}"> 
    10.1 --- a/pom.xml	Fri Nov 11 08:48:46 2016 +0100
    10.2 +++ b/pom.xml	Fri Apr 28 13:32:00 2017 +0200
    10.3 @@ -27,7 +27,9 @@
    10.4  	</modules>
    10.5  
    10.6  	<properties>
    10.7 -		<colibri.framework.version>6.0</colibri.framework.version>
    10.8 +		<colibri.framework.version>6.0.1</colibri.framework.version>
    10.9 +		<palojlib.framework.version>6.0</palojlib.framework.version>
   10.10 +		<adaptive.framework.version>6.0</adaptive.framework.version>
   10.11  		<cxfVersion>3.1.6</cxfVersion>
   10.12  		<maven.maven.licenseFile>COPYING.txt</maven.maven.licenseFile>
   10.13  		<jsr250-api.version>1.0</jsr250-api.version>
   10.14 @@ -167,7 +169,7 @@
   10.15  			<dependency>
   10.16  			    <groupId>com.proclos</groupId>
   10.17  			    <artifactId>palojlib</artifactId>
   10.18 -			    <version>${colibri.framework.version}</version>
   10.19 +			    <version>${palojlib.framework.version}</version>
   10.20  			    <scope>compile</scope>
   10.21  			</dependency>
   10.22  			<dependency>
   10.23 @@ -185,9 +187,16 @@
   10.24  			<dependency>
   10.25  			    <groupId>com.proclos</groupId>
   10.26  			    <artifactId>adaptive-commons</artifactId>
   10.27 -			    <version>${colibri.framework.version}</version>
   10.28 +			    <version>${adaptive.framework.version}</version>
   10.29  			    <scope>compile</scope>
   10.30  			</dependency>
   10.31 +			<!-- needed to ensure correct groovy version -->
   10.32 +			<dependency>
   10.33 +				<groupId>org.codehaus.groovy</groupId>
   10.34 +				<artifactId>groovy-all</artifactId>
   10.35 +				<version>2.4.0</version>
   10.36 +				<scope>runtime</scope>
   10.37 +			</dependency>
   10.38  			<dependency>
   10.39  			    <groupId>com.sun.xsom</groupId>
   10.40  			    <artifactId>xsom</artifactId>
   10.41 @@ -282,12 +291,6 @@
   10.42  				<scope>compile</scope>
   10.43  			</dependency>
   10.44  			<dependency>
   10.45 -				<groupId>org.hibernate</groupId>
   10.46 -				<artifactId>hibernate-jmx</artifactId>
   10.47 -				<version>3.5.6-Final</version>
   10.48 -				<scope>compile</scope>
   10.49 -			</dependency>
   10.50 -			<dependency>
   10.51  				<groupId>org.slf4j</groupId>
   10.52  				<artifactId>slf4j-api</artifactId>
   10.53  				<version>1.6.1</version>