jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mreut...@apache.org
Subject svn commit: r149265 - in incubator/jackrabbit/trunk/contrib/tck-webapp: ./ maven.xml project.xml
Date Mon, 31 Jan 2005 14:42:45 GMT
Author: mreutegg
Date: Mon Jan 31 06:42:40 2005
New Revision: 149265

URL: http://svn.apache.org/viewcvs?view=rev&rev=149265
Log:
Some Maven fine tuning.

Modified:
    incubator/jackrabbit/trunk/contrib/tck-webapp/   (props changed)
    incubator/jackrabbit/trunk/contrib/tck-webapp/maven.xml
    incubator/jackrabbit/trunk/contrib/tck-webapp/project.xml

Propchange: incubator/jackrabbit/trunk/contrib/tck-webapp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jan 31 06:42:40 2005
@@ -0,0 +1 @@
+target

Modified: incubator/jackrabbit/trunk/contrib/tck-webapp/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/tck-webapp/maven.xml?view=diff&r1=149264&r2=149265
==============================================================================
--- incubator/jackrabbit/trunk/contrib/tck-webapp/maven.xml (original)
+++ incubator/jackrabbit/trunk/contrib/tck-webapp/maven.xml Mon Jan 31 06:42:40 2005
@@ -16,43 +16,39 @@
    limitations under the License.
   -->
 <project 
-	default="tck-war" 
-	xmlns:m="jelly:maven"
-	xmlns:ant="jelly:ant"
-	xmlns:j="jelly:core"
->
+        default="tck-war" 
+        xmlns:m="jelly:maven"
+        xmlns:ant="jelly:ant"
+        xmlns:j="jelly:core">
 
-	<goal name="tck-war">
-		<attainGoal name="tck-build" />
-		<attainGoal name="war:war" />
-	</goal>
+    <goal name="tck-war">
+        <attainGoal name="jackrabbit-install" />
+        <attainGoal name="jar:jar" />
+        <attainGoal name="war:war" />
+    </goal>
 
-	<goal name="tck-build">
-		<attainGoal name="jar:install" />
-	</goal>
-
-	<postGoal name="build:start">
-	  <attainGoal name="jackrabbit-install" />
-	</postGoal>
-	
-	<goal name="jackrabbit-install">
-	  <!-- build the dependend sub project -->
-      	  <m:reactor 
+    <goal name="jackrabbit-install">
+    <!-- build the dependend sub project -->
+        <m:reactor 
             basedir="../.."
             includes="project.xml"
             goals="jar:install"
             banner="Building"
             ignoreFailures="false"/>
-	</goal>
+     </goal>
 
-	<!-- post goal for cleaning the subprojects -->
-	<postGoal name="clean">
-    	<m:reactor 
-    		basedir="${basedir}"
+     <!-- post goal for cleaning the subprojects -->
+     <postGoal name="clean">
+         <m:reactor 
+            basedir="${basedir}"
             includes="../../project.xml"
             goals="clean"
             banner="Cleaning"
             ignoreFailures="true"/>
-	</postGoal>
+     </postGoal>
 
+     <postGoal name="war:webapp">
+         <ant:copy file="target/${pom.artifactId}-${pom.currentVersion}.jar" todir="target/tck-webapp/WEB-INF/lib"
/>
+         <ant:delete dir="target/tck-webapp/WEB-INF/classes/org" />
+     </postGoal>
 </project>

Modified: incubator/jackrabbit/trunk/contrib/tck-webapp/project.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/tck-webapp/project.xml?view=diff&r1=149264&r2=149265
==============================================================================
--- incubator/jackrabbit/trunk/contrib/tck-webapp/project.xml (original)
+++ incubator/jackrabbit/trunk/contrib/tck-webapp/project.xml Mon Jan 31 06:42:40 2005
@@ -31,14 +31,6 @@
     <dependencies>
 
         <!-- dependencies from jackrabbit that we want to bundle -->
-	  <dependency>
-            <id>tck-webapp</id>
-            <version>0.1</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-
         <dependency>
             <id>concurrent</id>
             <version>1.3.4</version>
@@ -56,7 +48,7 @@
         <dependency>
             <groupId>lucene</groupId>
             <artifactId>lucene</artifactId>
-            <version>1.3</version>
+            <version>1.4.3</version>
             <properties>
                 <war.bundle>true</war.bundle>
             </properties>
@@ -70,32 +62,31 @@
             </properties>
         </dependency>
 
-    <!-- jcr -->    
+        <!-- jcr -->    
         <dependency>
-            <id>jcr</id>
-            <version>0.15</version>
-            <!-- <properties>
-                <war.bundle>true</war.bundle>
-            </properties>-->
+            <groupId>jsr170</groupId>
+            <artifactId>jcr</artifactId>
+            <version>0.16.2</version>
+            <url>http://www.day.com/maven/jsr170/jars/jcr-0.16.2.jar</url>
         </dependency>
         <!-- dependencies from jcr that we want to bundle -->
         <dependency>
             <id>jackrabbit</id>
-            <version>0.15-dev</version>
+            <version>0.16.2-dev</version>
             <properties>
                 <war.bundle>true</war.bundle>
             </properties>
         </dependency>
 
-    	<dependency>
-      	<groupId>cqfs</groupId>
-      	<artifactId>cqfs-jackrabbit</artifactId>
-      	<version>3.5.6</version>
-      	<url>http://www.day.com/maven/cqfs/jars/cqfs-jackrabbit-3.5.6.jar</url>
-		<properties>
+        <dependency>
+            <groupId>cqfs</groupId>
+            <artifactId>cqfs-jackrabbit</artifactId>
+            <version>3.5.6</version>
+            <url>http://www.day.com/maven/cqfs/jars/cqfs-jackrabbit-3.5.6.jar</url>
+            <properties>
                 <war.bundle>true</war.bundle>
             </properties>
-    	</dependency>
+        </dependency>
 
         <dependency>
             <id>cqfs</id>
@@ -150,11 +141,20 @@
     <!-- ====================================================================== -->
     <build>
         <sourceDirectory>${basedir}/src/java</sourceDirectory>
+        <sourceModifications>
+            <sourceModification>
+                <className>fakeClass</className>
+                <excludes>
+                  <exclude>**/test/observation/*.java</exclude>
+                  <exclude>**/test/search/*.java</exclude>
+                </excludes>
+            </sourceModification>
+        </sourceModifications>
         <resources>
             <resource>
                 <directory>src/java</directory>
                 <includes>
-                    <include>**/*.java</include>
+                    <include>**/api/**/*.java</include>
                     <include>**/*.xml</include>
                     <include>**/*.xsd</include>
                     <include>**/*.properties</include>



Mime
View raw message