svn commit: r481938 - in /jackrabbit/trunk/jackrabbit-jcr-rmi: pom.xml src/java/ src/main/ src/main/java/ src/test/java/ src/test/java/org/ src/test/org/

[ju...@apache.org]

Author: jukka
Date: Sun Dec  3 14:00:03 2006
New Revision: 481938

URL: http://svn.apache.org/viewvc?view=rev&rev=481938
Log:
JCR-332: Maven 2 updates in jackrabbit-jcr-rmi

Added:
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/main/java/
      - copied from r481859, jackrabbit/trunk/jackrabbit-jcr-rmi/src/java/
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/test/java/
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/test/java/org/
      - copied from r481859, jackrabbit/trunk/jackrabbit-jcr-rmi/src/test/org/
Removed:
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/java/
    jackrabbit/trunk/jackrabbit-jcr-rmi/src/test/org/
Modified:
    jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml?view=diff&rev=481938&r1=481937&r2=481938
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml Sun Dec  3 14:00:03 2006
@@ -33,7 +33,7 @@
     <relativePath>..</relativePath>
   </parent>
   <artifactId>jackrabbit-jcr-rmi</artifactId>
-  <name>JCR-RMI</name>
+  <name>Jackrabbit JCR-RMI</name>
   <!--
     Keep the description on a single line. Otherwise Maven might generate
     a corrupted MANIFEST.MF (see http://jira.codehaus.org/browse/MJAR-4)
@@ -41,8 +41,8 @@
   <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. JCR-RMI is developed as a part of the Apache Jackrabbit project, but the implementation is compatible with all JCR content repositories.</description>
 
   <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <testSourceDirectory>src/test</testSourceDirectory>
+    <sourceDirectory>src/main/java</sourceDirectory>
+    <testSourceDirectory>src/testjava/</testSourceDirectory>
     <resources>
       <!-- Does not work with eclipse. Maybe we can move README.txt to src/main/resources? -->
       <!-- resource>
@@ -54,7 +54,7 @@
         </resource -->
       <resource>
         <targetPath>.</targetPath>
-        <directory>src/resources</directory>
+        <directory>${basedir}src/main/resources</directory>
         <includes>
           <include>*</include>
         </includes>
@@ -86,10 +86,9 @@
         <executions>
           <execution>
             <id>rmic</id>
-            <phase>compile</phase>
+            <phase>process-classes</phase>
             <configuration>
               <tasks>
-                <echo>Compile RMI stubs</echo>
                 <rmic base="${project.build.outputDirectory}" verify="true"
                       includes="org/apache/jackrabbit/rmi/server/**/Server*.class"
                       classpathref="maven.compile.classpath" />