jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r761683 - in /jackrabbit/commons/jcr-rmi/trunk: it/ jcr-rmi-it/ jcr-rmi-it/pom.xml jcr-rmi/ jcr-rmi/pom.xml jcr-rmi/src/ pom.xml src/
Date Fri, 03 Apr 2009 14:08:00 GMT
Author: jukka
Date: Fri Apr  3 14:08:00 2009
New Revision: 761683

URL: http://svn.apache.org/viewvc?rev=761683&view=rev
Log:
JCRRMI-14: Integration tests for JCR-RMI

Reorganized the jcr-rmi trunk so that the integration tests can be included as a separate
module. Unfortunately they can not be embedded as a submodule of the normal jcr-rmi component
as only projects with "pom" packaging can have modules.

Added:
    jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/
    jackrabbit/commons/jcr-rmi/trunk/jcr-rmi-it/   (props changed)
      - copied from r761681, jackrabbit/commons/jcr-rmi/trunk/it/
    jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/pom.xml   (contents, props changed)
      - copied, changed from r761681, jackrabbit/commons/jcr-rmi/trunk/pom.xml
    jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/   (props changed)
      - copied from r761681, jackrabbit/commons/jcr-rmi/trunk/src/
Removed:
    jackrabbit/commons/jcr-rmi/trunk/it/
    jackrabbit/commons/jcr-rmi/trunk/src/
Modified:
    jackrabbit/commons/jcr-rmi/trunk/jcr-rmi-it/pom.xml
    jackrabbit/commons/jcr-rmi/trunk/pom.xml

Propchange: jackrabbit/commons/jcr-rmi/trunk/jcr-rmi-it/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr  3 14:08:00 2009
@@ -0,0 +1,5 @@
+.*
+target
+*.iml
+*.ipr
+*.iws

Propchange: jackrabbit/commons/jcr-rmi/trunk/jcr-rmi-it/
------------------------------------------------------------------------------
    svn:mergeinfo = /jackrabbit/branches/1.3/jackrabbit-jcr-rmi/it:631261

Modified: jackrabbit/commons/jcr-rmi/trunk/jcr-rmi-it/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/jcr-rmi/trunk/jcr-rmi-it/pom.xml?rev=761683&r1=761681&r2=761683&view=diff
==============================================================================
--- jackrabbit/commons/jcr-rmi/trunk/jcr-rmi-it/pom.xml (original)
+++ jackrabbit/commons/jcr-rmi/trunk/jcr-rmi-it/pom.xml Fri Apr  3 14:08:00 2009
@@ -24,8 +24,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
-    <artifactId>parent</artifactId>
-    <version>2</version>
+    <artifactId>jcr-rmi-reactor</artifactId>
+    <version>2.0-SNAPSHOT</version>
   </parent>
 
   <prerequisites>
@@ -35,8 +35,7 @@
   <!-- =================================================================== -->
   <!-- P R O J E C T  D E S C R I P T I O N                                -->
   <!-- =================================================================== -->
-  <artifactId>jcr-rmi-integration-test</artifactId>
-  <version>SNAPSHOT</version>
+  <artifactId>jcr-rmi-it</artifactId>
 
   <name>Jackrabbit JCR-RMI Integration Tests</name>
 
@@ -114,3 +113,4 @@
   </dependencies>
 
 </project>
+

Copied: jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/pom.xml (from r761681, jackrabbit/commons/jcr-rmi/trunk/pom.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/pom.xml?p2=jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/pom.xml&p1=jackrabbit/commons/jcr-rmi/trunk/pom.xml&r1=761681&r2=761683&rev=761683&view=diff
==============================================================================
--- jackrabbit/commons/jcr-rmi/trunk/pom.xml (original)
+++ jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/pom.xml Fri Apr  3 14:08:00 2009
@@ -24,8 +24,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
-    <artifactId>parent</artifactId>
-    <version>2</version>
+    <artifactId>jcr-rmi-reactor</artifactId>
+    <version>2.0-SNAPSHOT</version>
   </parent>
 
   <prerequisites>
@@ -36,7 +36,6 @@
   <!-- P R O J E C T  D E S C R I P T I O N                                -->
   <!-- =================================================================== -->
   <artifactId>jcr-rmi</artifactId>
-  <version>2.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>Jackrabbit JCR-RMI</name>
@@ -124,21 +123,6 @@
           </instructions>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <systemProperties>
-            <property>
-              <name>derby.system.durability</name>
-              <value>test</value>
-            </property>
-            <property>
-              <name>derby.stream.error.file</name>
-              <value>target/derby.log</value>
-            </property>
-          </systemProperties>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 
@@ -187,12 +171,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>it</id>
-      <modules>
-        <module>it</module>
-      </modules>
-    </profile>
   </profiles>
 
   <!-- =================================================================== -->

Propchange: jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/pom.xml
------------------------------------------------------------------------------
    svn:mergeinfo = /jackrabbit/branches/1.3/jackrabbit-jcr-rmi/pom.xml:631261

Propchange: jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/
------------------------------------------------------------------------------
    svn:mergeinfo = /jackrabbit/branches/1.3/jackrabbit-jcr-rmi/src:631261

Modified: jackrabbit/commons/jcr-rmi/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/jcr-rmi/trunk/pom.xml?rev=761683&r1=761682&r2=761683&view=diff
==============================================================================
--- jackrabbit/commons/jcr-rmi/trunk/pom.xml (original)
+++ jackrabbit/commons/jcr-rmi/trunk/pom.xml Fri Apr  3 14:08:00 2009
@@ -32,220 +32,16 @@
     <maven>2.0.9</maven>
   </prerequisites>
 
-  <!-- =================================================================== -->
-  <!-- P R O J E C T  D E S C R I P T I O N                                -->
-  <!-- =================================================================== -->
-  <artifactId>jcr-rmi</artifactId>
+  <artifactId>jcr-rmi-reactor</artifactId>
   <version>2.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
+  <packaging>pom</packaging>
 
-  <name>Jackrabbit JCR-RMI</name>
-  <description>
-    JCR-RMI is a transparent Remote Method Invocation (RMI) layer for the
-    Content Repository for Java Technology API (JCR). The layer makes it
-    possible to remotely access JCR content repositories.
-  </description>
+  <name>Jackrabbit JCR-RMI Reactor</name>
 
-  <!-- =================================================================== -->
-  <!-- B U I L D   S E T T I N G S                                         -->
-  <!-- =================================================================== -->
-  <build>
-    <plugins>
-      <!-- Use Java 1.4 for now -->
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <target>1.4</target>
-          <source>1.4</source>
-        </configuration>
-      </plugin>
-      <!-- JCR-704: Enable maven-source-plugin -->
-      <plugin>
-        <artifactId>maven-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-sources</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>rmic</id>
-            <phase>process-classes</phase>
-            <configuration>
-              <tasks>
-                <rmic base="${project.build.outputDirectory}"
-                      verify="true"
-                      classpathref="maven.compile.classpath"/>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <systemProperties>
-            <property>
-              <name>derby.system.durability</name>
-              <value>test</value>
-            </property>
-            <property>
-              <name>derby.stream.error.file</name>
-              <value>target/derby.log</value>
-            </property>
-          </systemProperties>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.0</version>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-Category>jcr,jackrabbit</Bundle-Category>
-            <Bundle-DocURL>http://jackrabbit.apache.org/</Bundle-DocURL>
-            <Export-Package>
-              org.apache.jackrabbit.rmi.*;version=${pom.version}
-            </Export-Package>
-            <!-- optional resolution XA -->
-            <Import-Package>
-              javax.transaction.xa;resolution:=optional,*
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <systemProperties>
-            <property>
-              <name>derby.system.durability</name>
-              <value>test</value>
-            </property>
-            <property>
-              <name>derby.stream.error.file</name>
-              <value>target/derby.log</value>
-            </property>
-          </systemProperties>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-    <!-- JCR-661: The antrun tools.jar dependency is not needed on macs -->
-    <profile>
-      <id>non-mac</id>
-      <activation>
-        <os>
-          <family>!mac</family>
-        </os>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <dependencies>
-              <dependency>
-                <groupId>sun</groupId>
-                <artifactId>tools</artifactId>
-                <version>1.0</version>
-                <scope>system</scope>
-                <systemPath>${java.home}/../lib/tools.jar</systemPath>
-              </dependency>
-            </dependencies>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>release</id>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>it</id>
-      <modules>
-        <module>it</module>
-      </modules>
-    </profile>
-  </profiles>
-
-  <!-- =================================================================== -->
-  <!-- D E P E N D E N C I E S                                             -->
-  <!-- =================================================================== -->
-  <dependencies>
-    <!-- Hard dependencies -->
-    <dependency>
-      <groupId>javax.jcr</groupId>
-      <artifactId>jcr</artifactId>
-      <version>1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.jackrabbit</groupId>
-      <artifactId>jackrabbit-api</artifactId>
-      <version>1.5.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.jackrabbit</groupId>
-      <artifactId>jackrabbit-jcr-commons</artifactId>
-      <version>1.5.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.5.3</version>
-    </dependency>
-
-    <!-- Test dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.jackrabbit</groupId>
-      <artifactId>jackrabbit-core</artifactId>
-      <version>1.5.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.5.3</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>1.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+  <modules>
+    <module>jcr-rmi</module>
+    <module>jcr-rmi-it</module>
+  </modules>
 
 </project>
+



Mime
View raw message