chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gabri...@apache.org
Subject svn commit: r1076623 - in /chemistry/opencmis/trunk: chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml pom.xml src/main/assembly/docs-assembly.xml src/site/site.xml
Date Thu, 03 Mar 2011 13:41:29 GMT
Author: gabriele
Date: Thu Mar  3 13:41:28 2011
New Revision: 1076623

URL: http://svn.apache.org/viewvc?rev=1076623&view=rev
Log:
-- Finalize removal of incubator info from POMs as per CMIS-305
-- fixed site generation (menu) and remove links to unmaintained APT maven generated pages
(all maintained in Apache CMS now)
-- Fixed failsafe report (now all aggregate in one top level test report) as per CMIS-323
-- updated misc plugins version and centralized repositories declarations



Modified:
    chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml
    chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml
    chemistry/opencmis/trunk/pom.xml
    chemistry/opencmis/trunk/src/main/assembly/docs-assembly.xml
    chemistry/opencmis/trunk/src/site/site.xml

Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml?rev=1076623&r1=1076622&r2=1076623&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml
(original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml
Thu Mar  3 13:41:28 2011
@@ -96,26 +96,5 @@
         </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>maven-repository.dev.java.net</id>
-            <name>Java.net Repository for Maven 1</name>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-        </repository>
-        <repository>
-            <id>maven2-repository.dev.java.net</id>
-            <name>Java.net Repository for Maven 2</name>
-            <url>http://download.java.net/maven/2/</url>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>maven2-repository.dev.java.net</id>
-            <url>http://download.java.net/maven/2/</url>
-        </pluginRepository>
-    </pluginRepositories>
-    
     
 </project>

Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml?rev=1076623&r1=1076622&r2=1076623&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml Thu
Mar  3 13:41:28 2011
@@ -56,11 +56,10 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>failsafe-maven-plugin</artifactId>
-                <version>2.4.3-alpha-1</version>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>2.7.2</version>
                 <configuration>
-                    <outputName>integration-test</outputName>
                     <encoding>UTF-8</encoding>
                     <forkMode>once</forkMode>
                     <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
@@ -123,21 +122,24 @@
         </plugins>
     </build>
 
+    <!--
     <reporting>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
+                <version>2.7.2</version>
                 <reportSets>
                     <reportSet>
                         <id>integration-tests</id>
                         <reports>
                             <report>report-only</report>
                         </reports>
+
                         <configuration>
                             <outputName>failsafe-report</outputName>
                             <reportsDirectories>
-                                <reportsDirectory>${basedir}/target/failsafe-reports</reportsDirectory>
+                                <reportsDirectory>${project.build.directory}/failsafe-reports</reportsDirectory>
                             </reportsDirectories>
                         </configuration>
                     </reportSet>
@@ -145,6 +147,7 @@
             </plugin>
         </plugins>
     </reporting>
+    -->
 
     <dependencies>
         <dependency>

Modified: chemistry/opencmis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/pom.xml?rev=1076623&r1=1076622&r2=1076623&view=diff
==============================================================================
--- chemistry/opencmis/trunk/pom.xml (original)
+++ chemistry/opencmis/trunk/pom.xml Thu Mar  3 13:41:28 2011
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
-        <version>7</version>
+        <version>9</version>
     </parent>
 
     <!-- Project Information -->
@@ -37,7 +37,7 @@
         <url>http://www.apache.org/</url>
     </organization>
 
-    <url>http://incubator.apache.org/chemistry/</url>
+    <url>http://chemistry.apache.org/</url>
     <ciManagement>
         <system>Hudson Zones Apache</system>
         <url>http://hudson.zones.apache.org/hudson/view/Chemistry/</url>
@@ -184,8 +184,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compile.source>1.5</maven.compile.source>
         <maven.compile.target>1.5</maven.compile.target>
-        <docs.start.url>http://incubator.apache.org/chemistry/index.html</docs.start.url>
-        <docs.download.directory>${project.build.directory}/site</docs.download.directory>
+        <docs.start.url>http://chemistry.apache.org/java/opencmis.html</docs.start.url>
+        <docs.download.directory>${project.build.directory}/downloaded-site</docs.download.directory>
         <parentBasedir>${project.basedir}</parentBasedir>
     </properties>
 
@@ -275,7 +275,6 @@
                 <version>2.3</version>
                 <configuration>
                     <encoding>UTF-8</encoding>
-                    <filtering>false</filtering>
                 </configuration>
             </plugin>
             <plugin>
@@ -344,6 +343,34 @@
         </plugins>
     </build>
 
+
+    <repositories>
+        <repository>
+            <id>maven-repository.dev.java.net</id>
+            <name>Java.net Repository for Maven 1</name>
+            <url>http://download.java.net/maven/1/</url>
+            <layout>legacy</layout>
+        </repository>
+        <repository>
+            <id>maven2-repository.dev.java.net</id>
+            <name>Java.net Repository for Maven 2</name>
+            <url>http://download.java.net/maven/2/</url>
+        </repository>
+    </repositories>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>maven2-repository.dev.java.net</id>
+            <url>http://download.java.net/maven/2/</url>
+        </pluginRepository>
+       <pluginRepository>
+           <id>jboss-public</id>
+           <name>Jboss Repository for Maven 2</name>
+           <url>http://repository.jboss.org/maven2/</url>
+       </pluginRepository>
+
+    </pluginRepositories>
+
     <dependencies>
         <dependency>
             <groupId>commons-codec</groupId>
@@ -376,12 +403,22 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
+                <inherited>false</inherited>
                 <configuration>
                     <aggregate>true</aggregate>
+                    <reportsDirectories>
+                        <reportsDirectory>${project.build.directory}/surefire-reports/</reportsDirectory>
+                        <reportsDirectory>${project.build.directory}/failsafe-reports/</reportsDirectory>
+                    </reportsDirectories>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jxr-plugin</artifactId>
+                <version>2.1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
                 <version>2.0.1</version>
             </plugin>
@@ -416,12 +453,12 @@
                                     <executable>wget</executable>
                                     <arguments>
                                         <argument>--directory-prefix=${docs.download.directory}</argument>
-                                        <argument>--domains=incubator.apache.org</argument>
-                                        <argumnet>--mirror</argumnet>
-                                        <argumnet>-k</argumnet>
-                                        <argumnet>-np</argumnet>
-                                        <argument>--include-directories=/chemistry
</argument>
-                                        <argument>--exclude-directories=/chemistry/javadoc,/chemistry/maven-site</argument>
+                                        <argument>--domains=chemistry.apache.org</argument>
+                                        <argument>--mirror</argument>
+                                        <argument>-k</argument>
+                                        <argument>-np</argument>
+                                        <argument>--include-directories=/java/${version}</argument>
+                                        <argument>--exclude-directories=/java/${version}/javadoc/,/java/${version}/maven-site/</argument>
                                         <argument>${docs.start.url}</argument>
                                     </arguments>
                                 </configuration>
@@ -446,7 +483,7 @@
                     <!-- Assemblies the doc package -->
                     <plugin>
                         <artifactId>maven-assembly-plugin</artifactId>
-                        <version>2.2-beta-5</version>
+                        <version>2.2.1</version>
                         <inherited>false</inherited>
                         <configuration>
                             <attach>true</attach>
@@ -457,7 +494,7 @@
                         </configuration>
                     </plugin>
                     <!--
-                        We want to package up license/incubator
+                        We want to package up licenses
                         resources in the JARs produced
                     -->
                     <plugin>
@@ -470,13 +507,13 @@
                                 </goals>
                                 <configuration>
                                     <resourceBundles>
-                                        <resourceBundle>org.apache.chemistry.resources:chemistry-jar-resource-bundle:1.0</resourceBundle>
+                                        <!-- resourceBundle>org.apache.chemistry.resources:chemistry-jar-resource-bundle:1.0</resourceBundle-->
                                         <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
                                     </resourceBundles>
                                     <supplementalModels>
                                         <supplementalModel>${parentBasedir}/src/main/appended-resources/supplemental-models.xml</supplementalModel>
                                     </supplementalModels>
-                                    <!-- runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot
-->
+                                    <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
                                 </configuration>
                             </execution>
                         </executions>

Modified: chemistry/opencmis/trunk/src/main/assembly/docs-assembly.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/src/main/assembly/docs-assembly.xml?rev=1076623&r1=1076622&r2=1076623&view=diff
==============================================================================
--- chemistry/opencmis/trunk/src/main/assembly/docs-assembly.xml (original)
+++ chemistry/opencmis/trunk/src/main/assembly/docs-assembly.xml Thu Mar  3 13:41:28 2011
@@ -28,7 +28,7 @@
     <includeBaseDirectory>false</includeBaseDirectory>
     <fileSets>
         <fileSet>
-            <directory>${project.build.directory}/site/incubator.apache.org/chemistry</directory>
+            <directory>${project.build.directory}/downloaded-site/chemistry.apache.org/java</directory>
             <outputDirectory>sitedocs</outputDirectory>
             <includes>
                 <include>**</include>

Modified: chemistry/opencmis/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/src/site/site.xml?rev=1076623&r1=1076622&r2=1076623&view=diff
==============================================================================
--- chemistry/opencmis/trunk/src/site/site.xml (original)
+++ chemistry/opencmis/trunk/src/site/site.xml Thu Mar  3 13:41:28 2011
@@ -24,7 +24,7 @@
 
 	<bannerRight>
 		<name>${project.name}</name>
-		<src>http://incubator.apache.org/images/apache-incubator-logo.png</src>
+		<src>http://chemistry.apache.org/images/apache-incubator-logo.png</src>
 		<href>http://www.apache.org/</href>
 	</bannerRight>
 	
@@ -34,25 +34,12 @@
 	</skin>
 
 	<body>
-		<menu ref="parent" />
-        <menu ref="modules" />
-		<menu ref="reports" />
+		<menu ref="parent" inherit="top" />
+        <menu ref="modules" inherit="top" />
+		<menu ref="reports" inherit="top" />
 
-		<menu name="OpenCMIS">
-			<item name="Introduction" href="index.html" />
-			<item name="How to build OpenCMIS" href="how-to-build.html" />
-		</menu>
-		<menu name="CMIS Client">
-			<item name="Client API" href="client-api.html" />
-			<item name="Client Binding Layer" href="client-binding.html" />
-		</menu>
-		<menu name="CMIS Server">
-			<item name="Server Framework" href="server.html" />
-			<item name="InMemory Repository" href="server-inmemory.html" />
-			<item name="FileShare Repository" href="server-fileshare.html" />
-		</menu>
-		<menu name="Tests and Tools">
-			<item name="CMIS Browser" href="browser.html" />
+		<menu name="Chemistry" inherit="top">
+			<item name="Main Website" href="http://chemistry.apache.org" />
 		</menu>
 	</body>
 </project>
\ No newline at end of file



Mime
View raw message