Author: keith
Date: Thu May 1 23:43:54 2008
New Revision: 16468
Log:
Adding dataservices to the build. Gte the ui jar from a maven repo strip it and
get it into the build
Modified:
trunk/mashup/java/modules/distribution/create-distro-build.xml
trunk/mashup/java/modules/distribution/pom.xml
trunk/mashup/java/modules/integration/pom.xml
trunk/mashup/java/pom.xml
Modified: trunk/mashup/java/modules/distribution/create-distro-build.xml
==============================================================================
--- trunk/mashup/java/modules/distribution/create-distro-build.xml
(original)
+++ trunk/mashup/java/modules/distribution/create-distro-build.xml Thu May
1 23:43:54 2008
@@ -180,6 +180,17 @@
<move file="target/temp/tinyxmlsax.js"
todir="${dist.dir}/lib/tomcat/webapps/ROOT/js/xml-for-script"/>
<move file="target/temp/tinyxmlw3cdom.js"
todir="${dist.dir}/lib/tomcat/webapps/ROOT/js/xml-for-script"/>
+ <echo message="### Extract and Copy the Data Services UI content ###"/>
+ <unzip
src="target/zips/org.wso2.solutions.ds.ui-${dataService.version}.jar"
dest="target/temp"/>
+ <move todir="${dist.dir}/lib/tomcat/webapps/ROOT/extensions">
+ <fileset dir="target/temp/web/extensions">
+ <exclude name="core/images/*.*"/>
+ <exclude name="core/js/main.js"/>
+ </fileset>
+ </move>
+ <delete
dir="${dist.dir}/lib/tomcat/webapps/ROOT/extensions/core/images"/>
+ <replace
file="${dist.dir}/lib/tomcat/webapps/ROOT/extensions/core/js/data_service.js"
token="DataServiceAdmin" value="MashupDataServiceAdmin"/>
+
<echo message="### Extract and Copy the WSRequest Native ###"/>
<unzip src="target/zips/wsrequest-${wsrequest.version}.zip"
dest="target/temp/wsrequest"/>
<move file="target/temp/wsrequest/WSRequest.js"
todir="${dist.dir}/lib/tomcat/webapps/ROOT/js/wso2"/>
Modified: trunk/mashup/java/modules/distribution/pom.xml
==============================================================================
--- trunk/mashup/java/modules/distribution/pom.xml (original)
+++ trunk/mashup/java/modules/distribution/pom.xml Thu May 1 23:43:54 2008
@@ -143,6 +143,7 @@
<property name="codepress.version"
value="${codepress.version}"/>
<property name="xml-for-script.version"
value="${xml-for-script.version}"/>
<property name="wsrequest.version"
value="${wsrequest.version}"/>
+ <property name="dataService.version"
value="${dataService.version}"/>
<property name="derby.version"
value="${derby.version}"/>
<property name="registry.driverClass"
value="${registry.driverClass}"/>
@@ -332,6 +333,14 @@
<overWrite>true</overWrite>
<outputDirectory>target/zips</outputDirectory>
</artifactItem>
+ <artifactItem>
+ <groupId>org.wso2.dataservice</groupId>
+
<artifactId>org.wso2.solutions.ds.ui</artifactId>
+ <version>${dataService.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+
<outputDirectory>target/zips</outputDirectory>
+ </artifactItem>
</artifactItems>
</configuration>
</execution>
Modified: trunk/mashup/java/modules/integration/pom.xml
==============================================================================
--- trunk/mashup/java/modules/integration/pom.xml (original)
+++ trunk/mashup/java/modules/integration/pom.xml Thu May 1 23:43:54 2008
@@ -155,6 +155,14 @@
<overWrite>true</overWrite>
<outputDirectory>target/dist-lib</outputDirectory>
</artifactItem>
+ <artifactItem>
+ <groupId>org.wso2.dataservice</groupId>
+
<artifactId>org.wso2.solutions.ds.ui</artifactId>
+ <version>${dataService.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+
<outputDirectory>target/zips</outputDirectory>
+ </artifactItem>
</artifactItems>
</configuration>
</execution>
@@ -188,6 +196,7 @@
<property name="codepress.version"
value="${codepress.version}"/>
<property name="xml-for-script.version"
value="${xml-for-script.version}"/>
<property name="wsrequest.version"
value="${wsrequest.version}"/>
+ <property name="dataService.version"
value="${dataService.version}"/>
<property name="derby.version"
value="${derby.version}"/>
<property name="registry.driverClass"
value="${registry.driverClass}"/>
Modified: trunk/mashup/java/pom.xml
==============================================================================
--- trunk/mashup/java/pom.xml (original)
+++ trunk/mashup/java/pom.xml Thu May 1 23:43:54 2008
@@ -1329,5 +1329,6 @@
<opensaml.version>1.1.406</opensaml.version>
<openid.version>0.9.3.1</openid.version>
<openws.version>1.0</openws.version>
+ <dataService.version>0.1alpha</dataService.version>
</properties>
</project>
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
