Return-Path: 
 <commits-return-3184-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org>
Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org
Received: (qmail 12974 invoked from network); 21 Nov 2006 11:40:17 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 21 Nov 2006 11:40:17 -0000
Received: (qmail 57721 invoked by uid 500); 21 Nov 2006 11:40:27 -0000
Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org
Received: (qmail 57700 invoked by uid 500); 21 Nov 2006 11:40:27 -0000
Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@jackrabbit.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@jackrabbit.apache.org>
List-Post: <mailto:commits@jackrabbit.apache.org>
List-Id: <commits.jackrabbit.apache.org>
Reply-To: dev@jackrabbit.apache.org
Delivered-To: mailing list commits@jackrabbit.apache.org
Received: (qmail 57690 invoked by uid 99); 21 Nov 2006 11:40:27 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Nov 2006 03:40:27 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Nov 2006 03:40:16 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 4E78A1A9846; Tue, 21 Nov 2006 03:39:42 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r477632 - in /jackrabbit/trunk/jcr-server: maven.xml
 project.xml
Date: Tue, 21 Nov 2006 11:39:42 -0000
To: commits@jackrabbit.apache.org
From: angela@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061121113942.4E78A1A9846@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: angela
Date: Tue Nov 21 03:39:41 2006
New Revision: 477632

URL: http://svn.apache.org/viewvc?view=rev&rev=477632
Log:
JCR-612 : Restructure the Jackrabbit source tree

move jcr-server/server one level up
update maven.xml, project.xml

Modified:
    jackrabbit/trunk/jcr-server/maven.xml
    jackrabbit/trunk/jcr-server/project.xml

Modified: jackrabbit/trunk/jcr-server/maven.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jcr-server/maven.xml?view=diff&rev=477632&r1=477631&r2=477632
==============================================================================
--- jackrabbit/trunk/jcr-server/maven.xml (original)
+++ jackrabbit/trunk/jcr-server/maven.xml Tue Nov 21 03:39:41 2006
@@ -15,19 +15,8 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project
-    default="multiproject:install"
-    xmlns:ant="jelly:ant"
-    xmlns:m="jelly:maven"
->
-    <!--
-        redefine some common goals
-    -->
+<project default="jar:install">
     <goal name="clean">
-        <attainGoal name="multiproject:clean"/>
-    </goal>
-    
-    <goal name="idea">
-        <attainGoal name="idea:multiproject"/>
+       <attainGoal name="clean:clean"/>
     </goal>
 </project>

Modified: jackrabbit/trunk/jcr-server/project.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jcr-server/project.xml?view=diff&rev=477632&r1=477631&r2=477632
==============================================================================
--- jackrabbit/trunk/jcr-server/project.xml (original)
+++ jackrabbit/trunk/jcr-server/project.xml Tue Nov 21 03:39:41 2006
@@ -21,16 +21,12 @@
     <!-- ====================================================================== -->
     <pomVersion>3</pomVersion>
     <groupId>org.apache.jackrabbit</groupId>
-    <artifactId>server</artifactId>
+    <artifactId>jackrabbit-jcr-server</artifactId>
     
-    <name>Jackrabbit-Server</name>
+    <name>Jackrabbit WebDAV Server</name>
     <currentVersion>1.1-SNAPSHOT</currentVersion>
     <inceptionYear>2005</inceptionYear>
     <package>org.apache.jackrabbit.*</package>
-    <description>
-        WebDAV library and WebDAV based JCR client/server connection facility.
-    </description>
-    <shortDescription>JCRWebdav Server</shortDescription>
     
     <licenses>
         <license>
@@ -39,4 +35,77 @@
             <distribution>repo</distribution>
         </license>
     </licenses>
+
+    <!-- ====================================================================== -->
+    <!-- D E P E N D E N C I E S                                                -->
+    <!-- ====================================================================== -->
+    <dependencies>
+        <!-- internal dependencies -->
+        <dependency>
+            <artifactId>jackrabbit-webdav</artifactId>
+            <groupId>org.apache.jackrabbit</groupId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.jackrabbit</groupId>
+            <artifactId>jackrabbit-jcr-commons</artifactId>
+            <version>${jackrabbit.build.version.jackrabbit}</version>
+        </dependency>
+
+        <!-- external dependencies -->
+        <dependency>
+            <groupId>jsr170</groupId>
+            <artifactId>jcr</artifactId>
+            <version>${jackrabbit.build.version.jcr}</version>
+        </dependency>
+        
+        <!-- non-jackrabbit dependencies -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>servletapi</groupId>
+            <artifactId>servletapi</artifactId>
+            <version>2.3</version>
+        </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>2.6.2</version>
+            <url>http://xerces.apache.org/xerces2-j/</url>
+        </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xmlParserAPIs</artifactId>
+            <version>2.0.2</version>
+        </dependency>
+    </dependencies>
+
+    <!-- ====================================================================== -->
+    <!-- B U I L D  D E S C R I P T I O N                                       -->
+    <!-- ====================================================================== -->
+    <build>
+        <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <targetPath>META-INF</targetPath>
+                <directory>..</directory>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>README.txt</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                    <include>**/*.xsd</include>
+                    <include>**/*.properties</include>
+                    <include>**/*.dtd</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
 </project>