incubator-wookie-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scot...@apache.org
Subject svn commit: r1102261 - in /incubator/wookie/trunk: build.properties build.xml features/build.xml features/camera/build.xml features/conformance/build.xml features/jqmobile/build.xml features/polling/build.xml
Date Thu, 12 May 2011 12:24:58 GMT
Author: scottbw
Date: Thu May 12 12:24:58 2011
New Revision: 1102261

URL: http://svn.apache.org/viewvc?rev=1102261&view=rev
Log:
Simplified the build and deployment process for features, and added properties to the build.properties
file to select which feature sets are included when deploying Wookie. 

Removed:
    incubator/wookie/trunk/features/build.xml
    incubator/wookie/trunk/features/camera/build.xml
    incubator/wookie/trunk/features/conformance/build.xml
    incubator/wookie/trunk/features/jqmobile/build.xml
    incubator/wookie/trunk/features/polling/build.xml
Modified:
    incubator/wookie/trunk/build.properties
    incubator/wookie/trunk/build.xml

Modified: incubator/wookie/trunk/build.properties
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/build.properties?rev=1102261&r1=1102260&r2=1102261&view=diff
==============================================================================
--- incubator/wookie/trunk/build.properties (original)
+++ incubator/wookie/trunk/build.properties Thu May 12 12:24:58 2011
@@ -8,6 +8,11 @@ wookie.domain=localhost
 wookie.port=8080
 wookie.path=wookie/
 
+# Uncomment to include Extra features
+include.extra.features
+# Uncomment to include Scratchpad features
+#include.scratchpad.features
+
 # The location of your servlets webapp directory, (required: defaults to location for
 # standalone server)
 servletEngine.webapp.dir=build/webapp

Modified: incubator/wookie/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/build.xml?rev=1102261&r1=1102260&r2=1102261&view=diff
==============================================================================
--- incubator/wookie/trunk/build.xml (original)
+++ incubator/wookie/trunk/build.xml Thu May 12 12:24:58 2011
@@ -53,7 +53,10 @@
       <equals arg1="${wookie.persistence.manager.type}" arg2="jcr"/>
     </condition>
 	<antcall target="post-deploy-webapp-jpa"/>    
-	<antcall target="post-deploy-webapp-jcr"/>    
+	<antcall target="post-deploy-webapp-jcr"/>  
+  	<!-- deploy features -->
+	<antcall target="post-deploy-webapp-features-extra"/>  
+	<antcall target="post-deploy-webapp-features-scratchpad"/>  
   	<!-- deploy widgets -->
   	<delete dir="${widget.build.dir}"/>
   	<subant antfile="build.xml" target="deploy-widget" inheritall="true">
@@ -63,15 +66,24 @@
   	  	<exclude name="${widget.deploy.exclude}"/>
   	  </fileset>
   	</subant>
-  	<!-- deploy features -->
-  	<echo>deploy feature</echo>
-  	<subant antfile="build.xml" target="deploy-feature" inheritall="true">
-  	  <fileset dir="${wookie.features.dir}">
-  	  	<include name="${widget.deploy.include}"/>
-  	  </fileset>
-  	</subant>
   </target>
 
+  <target name="post-deploy-webapp-features-extra" if="include.extra.features">
+		<echo>deploying extra features</echo>
+	    <mkdir dir="${servletEngine.webapp.dir}/${ant.project.name}/features"/>
+	    <copy todir="${servletEngine.webapp.dir}/${ant.project.name}/features">
+   		    <fileset dir="${user.dir}/features"/>
+	    </copy>
+  </target>
+
+  <target name="post-deploy-webapp-features-scratchpad" if="include.scratchpad.features">
+		<echo>deploying scratchpad features</echo>
+		 <mkdir dir="${servletEngine.webapp.dir}/${ant.project.name}/features"/>
+		 <copy todir="${servletEngine.webapp.dir}/${ant.project.name}/features">
+	   		 <fileset dir="${user.dir}/scratchpad/features"/>
+		 </copy>
+  </target>
+	
   <target name="post-deploy-webapp-jpa" if="deploy.webapp.jpa">
     <!-- configure JPA web.xml resource ref -->
 	<copy file="${project.webapp.dir}/WEB-INF/web.xml"
@@ -274,15 +286,8 @@
         <path refid="project.openjpa.class.path" />
       </classpath>
     </openJPAEnhancer>
-    
-  	<!-- compile features -->
-  	<subant antfile="build.xml" target="build-feature" inheritall="true">
-  	  <fileset dir="${wookie.features.dir}">
-  	  	<include name="${widget.deploy.include}"/>
-  	  </fileset>
-  	</subant>
   </target>
-	
+
   <target name="post-compile-test">
     <!-- run unit tests, (skip functional and integration tests) -->
     <junit fork="yes" forkmode="once" printsummary="true" haltonfailure="true">



Mime
View raw message