svn commit: r679594 - in /openjpa/trunk/openjpa-project: assembly.xml pom.xml

[pcl-2]

Author: pcl
Date: Thu Jul 24 15:41:36 2008
New Revision: 679594

URL: http://svn.apache.org/viewvc?rev=679594&view=rev
Log:
moved docs, javadocs, and downloads output to openjpa-project, since it looks like trunk isn't including the top-level target/site dir anymore

Modified:
    openjpa/trunk/openjpa-project/assembly.xml
    openjpa/trunk/openjpa-project/pom.xml

Modified: openjpa/trunk/openjpa-project/assembly.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/assembly.xml?rev=679594&r1=679593&r2=679594&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/assembly.xml (original)
+++ openjpa/trunk/openjpa-project/assembly.xml Thu Jul 24 15:41:36 2008
@@ -65,7 +65,7 @@
             <outputDirectory>docs/manual</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>../target/site/apidocs</directory>
+            <directory>target/site/apidocs</directory>
             <outputDirectory>docs/javadoc</outputDirectory>
         </fileSet>
         <fileSet>

Modified: openjpa/trunk/openjpa-project/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/pom.xml?rev=679594&r1=679593&r2=679594&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/pom.xml (original)
+++ openjpa/trunk/openjpa-project/pom.xml Thu Jul 24 15:41:36 2008
@@ -52,45 +52,45 @@
         <openjpa.assembly.finalName>
             ${artifactId}-${version}</openjpa.assembly.finalName>
         <openjpa.assembly.outputDirectory>
-            ${project.basedir}/../target/site/downloads
+        ${project.basedir}/target/site/downloads
         </openjpa.assembly.outputDirectory>
 
         <openjpa.assembly.binarySuffix>binary</openjpa.assembly.binarySuffix>
         <openjpa.assembly.binaryBase>
-            ${openjpa.assembly.outputDirectory}/${openjpa.assembly.finalName}-${openjpa.assembly.binarySuffix}
+        ${openjpa.assembly.outputDirectory}/${openjpa.assembly.finalName}-${openjpa.assembly.binarySuffix}
         </openjpa.assembly.binaryBase>
         <openjpa.assembly.binaryFile>
-            ${openjpa.assembly.binaryBase}.zip
+        ${openjpa.assembly.binaryBase}.zip
         </openjpa.assembly.binaryFile>
 
         <openjpa.assembly.sourceSuffix>source</openjpa.assembly.sourceSuffix>
         <openjpa.assembly.sourceBase>
-            ${openjpa.assembly.outputDirectory}/${openjpa.assembly.finalName}-${openjpa.assembly.sourceSuffix}
+        ${openjpa.assembly.outputDirectory}/${openjpa.assembly.finalName}-${openjpa.assembly.sourceSuffix}
         </openjpa.assembly.sourceBase>
         <openjpa.assembly.sourceFile>
-            ${openjpa.assembly.sourceBase}.zip
+        ${openjpa.assembly.sourceBase}.zip
         </openjpa.assembly.sourceFile>
 
         <parent.site.docs>
-            ${project.basedir}/../target/site/docs
+        ${project.basedir}/target/site/docs
         </parent.site.docs>
 
         <docbook.source>${project.basedir}/src/doc/manual</docbook.source>
         <docbook.target>${project.basedir}/target/manual</docbook.target>
         <docbook.version>1.67.2</docbook.version>
         <local.repository>${settings.localRepository}</local.repository>
-    </properties>
+        </properties>
 
-    <build>
+        <build>
         <!-- needed to let maven pass the "compile" phase -->
         <testSourceDirectory>/none/</testSourceDirectory>
 
         <!-- filter site resources -->
         <resources>
-            <resource>
-                <directory>${project.basedir}/src/site</directory>
-                <!-- targetPath is relative to target/classes/ -->
-                <targetPath>../filtered-site</targetPath>
+        <resource>
+        <directory>${project.basedir}/src/site</directory>
+        <!-- targetPath is relative to target/classes/ -->
+        <targetPath>../filtered-site</targetPath>
                 <filtering>false</filtering>
             </resource>
         </resources>