release 5.2 5.2
authorchris
Thu, 19 Mar 2015 10:30:07 +0100
changeset 1574f06a4d97cd0
parent 156 ab7aa0ab5e57
child 158 b5d0e42c1c54
release 5.2
adaptive-commons/pom.xml
colibriweb/pom.xml
colibriweb/webapp/WEB-INF/web.xml
colibriweb/webapp/modules/common/componentEditorValuePart.xhtml
colibriweb/webapp/modules/common/fragmentCodeEditor.xhtml
etlcomponents/pom.xml
etlcore/pom.xml
palojlib/pom.xml
pom.xml
     1.1 --- a/adaptive-commons/pom.xml	Sat Feb 21 10:25:07 2015 +0100
     1.2 +++ b/adaptive-commons/pom.xml	Thu Mar 19 10:30:07 2015 +0100
     1.3 @@ -4,7 +4,7 @@
     1.4  	<parent>
     1.5  		<artifactId>colibri</artifactId>
     1.6  		<groupId>com.proclos</groupId>
     1.7 -		<version>5.2-SNAPSHOT</version>
     1.8 +		<version>5.2</version>
     1.9  	</parent>
    1.10  	<modelVersion>4.0.0</modelVersion>
    1.11  	<artifactId>adaptive-commons</artifactId>
     2.1 --- a/colibriweb/pom.xml	Sat Feb 21 10:25:07 2015 +0100
     2.2 +++ b/colibriweb/pom.xml	Thu Mar 19 10:30:07 2015 +0100
     2.3 @@ -3,7 +3,7 @@
     2.4  	<parent>
     2.5  		<artifactId>colibri</artifactId>
     2.6  		<groupId>com.proclos</groupId>
     2.7 -		<version>5.2-SNAPSHOT</version>
     2.8 +		<version>5.2</version>
     2.9  	</parent>
    2.10  	<modelVersion>4.0.0</modelVersion>
    2.11  	<artifactId>colibriweb</artifactId>
    2.12 @@ -250,18 +250,17 @@
    2.13  			<groupId>javax.inject</groupId>
    2.14  			<artifactId>javax.inject</artifactId>
    2.15  		</dependency>
    2.16 -         <!--  
    2.17 +        
    2.18 +        <!--  
    2.19  		<dependency>  
    2.20  			<groupId>org.primefaces.extensions</groupId>  
    2.21  			<artifactId>primefaces-extensions</artifactId>  
    2.22  		</dependency>
    2.23 +		<dependency>  
    2.24 +			<groupId>org.primefaces.extensions</groupId>  
    2.25 +			<artifactId>resources-codemirror</artifactId>  
    2.26 +	 	</dependency> 
    2.27  		-->
    2.28 -  		 <!-- 
    2.29 -  		 <dependency>  
    2.30 -			<groupId>org.primefaces.themes</groupId>  
    2.31 -			<artifactId>bluesky</artifactId>  
    2.32 -		</dependency>
    2.33 -		-->  
    2.34  		
    2.35  		<dependency>
    2.36  			<groupId>commons-digester</groupId>
     3.1 --- a/colibriweb/webapp/WEB-INF/web.xml	Sat Feb 21 10:25:07 2015 +0100
     3.2 +++ b/colibriweb/webapp/WEB-INF/web.xml	Thu Mar 19 10:30:07 2015 +0100
     3.3 @@ -2,6 +2,10 @@
     3.4  <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     3.5  	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
     3.6  	metadata-complete="true" version="3.0">
     3.7 +	<!-- speed up start but push does not work. atmosphere bug? 
     3.8 +	<absolute-ordering>
     3.9 +	</absolute-ordering>-->
    3.10 +	
    3.11  	<display-name>colibriweb</display-name>
    3.12  	<welcome-file-list>
    3.13  		<welcome-file>index.html</welcome-file>
     4.1 --- a/colibriweb/webapp/modules/common/componentEditorValuePart.xhtml	Sat Feb 21 10:25:07 2015 +0100
     4.2 +++ b/colibriweb/webapp/modules/common/componentEditorValuePart.xhtml	Thu Mar 19 10:30:07 2015 +0100
     4.3 @@ -48,8 +48,8 @@
     4.4  					<p:ajax global="true" process="@this" update=":content" event="change" listener="#{module.externalProjectSet()}"/>
     4.5  	        </p:selectOneMenu>  
     4.6  	    </s:decorate>
     4.7 -		<s:decorate template="/layout/fieldvalidation.xhtml" rendered="#{field.isNormalField() and field.isString()}" style="overflow:hidden;padding-left:#{padding}x;padding-right:10px;" id="stringField">
     4.8 -			<p:inputText value="#{field.value}"  style="#{field.isEncryptable() ? 'width:50%;' : 'width:100%;'}min-width:80px;" required="#{field.required}" requiredMessage="" onfocus="this.value = this.value;" rendered="#{!field.isScript()}">
     4.9 +		<s:decorate template="/layout/fieldvalidation.xhtml" rendered="#{field.isNormalField() and field.isString()}" style="overflow:hidden;padding-left:#{padding}x;padding-right:10px;">
    4.10 +			<p:inputText value="#{field.value}"  style="#{field.isEncryptable() ? 'width:50%;' : 'width:100%;'}min-width:80px;" required="#{field.required}" requiredMessage="" onfocus="this.value = this.value;" rendered="#{!field.isScript()}" id="stringField">
    4.11  				<p:ajax process="@this" event="change" listener="#{field.checkEncrypt()}" update="stringField" global="false"/>
    4.12  			</p:inputText>
    4.13  			<s:fragment rendered="#{field.isScript()}">
    4.14 @@ -73,11 +73,10 @@
    4.15  				<span class="inputlabel">Encrypt:</span>
    4.16  			</s:fragment>
    4.17  			<h:selectBooleanCheckbox value="#{field.encrypted}" rendered="#{field.isEncryptable()}">
    4.18 -				<p:ajax process="stringField" event="change" update="stringField" listener="#{field.toggleEncryption()}"/> 
    4.19 +				<p:ajax process="@this" event="change" update="@this stringField" listener="#{field.toggleEncryption()}"/> 
    4.20  			</h:selectBooleanCheckbox>
    4.21  		</s:decorate> 
    4.22  		
    4.23 -		
    4.24  		<s:decorate template="/layout/fieldvalidation.xhtml" rendered="#{field.isNormalField() and field.isInteger()}" style="float:left;margin-left:#{padding};" id="integer">
    4.25  			<p:spinner value="#{field.value}" readonly="false" min="#{empty field.value ? '0' : field.type.type.minValue}"  max="#{field.type.type.maxValue}" size="5" required="#{field.required}">
    4.26  				<p:ajax global="false" process="@this" event="change" update="integer" disabled="#{not empty field.value}"/> 
     5.1 --- a/colibriweb/webapp/modules/common/fragmentCodeEditor.xhtml	Sat Feb 21 10:25:07 2015 +0100
     5.2 +++ b/colibriweb/webapp/modules/common/fragmentCodeEditor.xhtml	Thu Mar 19 10:30:07 2015 +0100
     5.3 @@ -9,6 +9,12 @@
     5.4     	>
     5.5  	<h:panelGroup layout="block"  rendered="true" style="overflow:auto;" id="xmlEditPanelContent">
     5.6     		<s:decorate template="/layout/fieldvalidation.xhtml" id="codearea"> 
     5.7 +   		<!--  
     5.8 +   				<pe:codeMirror id="codeMirror" mode="text/xml"  widgetVar="editor"
     5.9 +    				value="#{module.instance.code}" lineNumbers="true" >
    5.10 +    				<p:ajax execute="@this" event="change" global="false"/>
    5.11 +    			</pe:codeMirror>
    5.12 +    	-->	  
    5.13  			  	 <div class="codeeditor">
    5.14  					<h:inputTextarea id="code" styleClass="inputfield" rows="20"
    5.15  						cols="120" style="width:99.4%;"
     6.1 --- a/etlcomponents/pom.xml	Sat Feb 21 10:25:07 2015 +0100
     6.2 +++ b/etlcomponents/pom.xml	Thu Mar 19 10:30:07 2015 +0100
     6.3 @@ -3,7 +3,7 @@
     6.4  	<parent>
     6.5  		<artifactId>colibri</artifactId>
     6.6  		<groupId>com.proclos</groupId>
     6.7 -		<version>5.2-SNAPSHOT</version>
     6.8 +		<version>5.2</version>
     6.9  		<relativePath>../</relativePath>
    6.10  	</parent>
    6.11  	<name>ETL-Components</name>
     7.1 --- a/etlcore/pom.xml	Sat Feb 21 10:25:07 2015 +0100
     7.2 +++ b/etlcore/pom.xml	Thu Mar 19 10:30:07 2015 +0100
     7.3 @@ -5,7 +5,7 @@
     7.4  	<parent>
     7.5  		<artifactId>colibri</artifactId>
     7.6  		<groupId>com.proclos</groupId>
     7.7 -		<version>5.2-SNAPSHOT</version>
     7.8 +		<version>5.2</version>
     7.9  		<relativePath>../</relativePath>
    7.10  	</parent>
    7.11  	<modelVersion>4.0.0</modelVersion>
     8.1 --- a/palojlib/pom.xml	Sat Feb 21 10:25:07 2015 +0100
     8.2 +++ b/palojlib/pom.xml	Thu Mar 19 10:30:07 2015 +0100
     8.3 @@ -2,7 +2,7 @@
     8.4    <parent>
     8.5  	<groupId>com.proclos</groupId>
     8.6  	<artifactId>colibri</artifactId>
     8.7 -	<version>5.2-SNAPSHOT</version>
     8.8 +	<version>5.2</version>
     8.9  	<relativePath>../</relativePath>
    8.10    </parent>
    8.11    <modelVersion>4.0.0</modelVersion>
     9.1 --- a/pom.xml	Sat Feb 21 10:25:07 2015 +0100
     9.2 +++ b/pom.xml	Thu Mar 19 10:30:07 2015 +0100
     9.3 @@ -5,7 +5,7 @@
     9.4  	<groupId>com.proclos</groupId>
     9.5  	<artifactId>colibri</artifactId>
     9.6  	<packaging>pom</packaging>
     9.7 -	<version>5.2-SNAPSHOT</version>
     9.8 +	<version>5.2</version>
     9.9  
    9.10  	<name>ETL</name>
    9.11  	<description>
    9.12 @@ -579,15 +579,22 @@
    9.13  			    <artifactId>bootstrap</artifactId>  
    9.14  			    <version>1.0.10</version> 
    9.15  			</dependency> 
    9.16 +			<!--  
    9.17  			<dependency>  
    9.18  			    <groupId>org.primefaces.extensions</groupId>  
    9.19  			    <artifactId>primefaces-extensions</artifactId>  
    9.20 -			    <version>1.0.0</version> 
    9.21 +			    <version>3.0.0</version> 
    9.22 +			</dependency>
    9.23 +			--> 
    9.24 +			<dependency>  
    9.25 +			    <groupId>org.primefaces.extensions</groupId>  
    9.26 +			    <artifactId>resources-codemirror</artifactId>  
    9.27 +			    <version>3.0.0</version> 
    9.28  			</dependency> 
    9.29  			<dependency>
    9.30  	            <groupId>org.atmosphere</groupId>
    9.31  	            <artifactId>atmosphere-runtime</artifactId>    
    9.32 -	            <version>2.2.2</version>  
    9.33 +	            <version>2.2.5</version>  
    9.34  	         </dependency>
    9.35  	         <dependency>
    9.36  				<groupId>javax.inject</groupId>