chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gabri...@apache.org
Subject svn commit: r1076688 - in /chemistry/opencmis/trunk: chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml pom.xml src/site/apt/index.apt src/site/site.xml
Date Thu, 03 Mar 2011 17:15:33 GMT
Author: gabriele
Date: Thu Mar  3 17:15:32 2011
New Revision: 1076688

URL: http://svn.apache.org/viewvc?rev=1076688&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 and javadocs aggregated reports (now all aggregate in one top level test
report) CMIS-323
-- updated misc plugins version and centralized repositories declarations



Modified:
    chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml
    chemistry/opencmis/trunk/pom.xml
    chemistry/opencmis/trunk/src/site/apt/index.apt
    chemistry/opencmis/trunk/src/site/site.xml

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=1076688&r1=1076687&r2=1076688&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 17:15:32 2011
@@ -122,33 +122,6 @@
         </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>${project.build.directory}/failsafe-reports</reportsDirectory>
-                            </reportsDirectories>
-                        </configuration>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-        </plugins>
-    </reporting>
-    -->
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: chemistry/opencmis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/pom.xml?rev=1076688&r1=1076687&r2=1076688&view=diff
==============================================================================
--- chemistry/opencmis/trunk/pom.xml (original)
+++ chemistry/opencmis/trunk/pom.xml Thu Mar  3 17:15:32 2011
@@ -234,9 +234,8 @@
                 <configuration>
                     <useReleaseProfile>false</useReleaseProfile>
                     <!-- TODO: Add autogenerated JIRA release notes -->
-                    <preparationGoals>clean install</preparationGoals>
-                    <goals>javadoc:aggregate deploy
-                        site-deploy</goals>
+                    <preparationGoals>clean verify</preparationGoals>
+                    <goals>deploy site-deploy</goals>
                     <arguments>-Papache-release</arguments>
                     <autoVersionSubmodules>true</autoVersionSubmodules>
                     <username>${apache.username}</username>
@@ -312,34 +311,6 @@
                     </archive>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.7</version>
-                <configuration>
-                    <doctitle>Apache Chemistry OpenCMIS ${project.version}</doctitle>
-                    <windowtitle>Apache Chemistry OpenCMIS ${project.version}</windowtitle>
-                    <groups>
-                        <group>
-                            <title>OpenCMIS Client API</title>
-                            <packages>org.apache.chemistry.opencmis.client.api</packages>
-                        </group>
-                        <group>
-                            <title>OpenCMIS Commons API</title>
-                            <packages>org.apache.chemistry.opencmis.commons:org.apache.chemistry.opencmis.commons.*</packages>
-                        </group>
-                        <group>
-                            <title>OpenCMIS Bindings SPI</title>
-                            <packages>org.apache.chemistry.opencmis.client.bindings</packages>
-                        </group>
-                        <group>
-                            <title>OpenCMIS Server</title>
-                            <packages>org.apache.chemistry.opencmis.commons.server:org.apache.chemistry.opencmis.commons.impl.server:org.apache.chemistry.opencmis.server.support:org.apache.chemistry.opencmis.server.support.query</packages>
-                        </group>
-                    </groups>
-                    <excludePackageNames>org.apache.chemistry.opencmis.commons.impl:org.apache.chemistry.opencmis.commons.impl.dataobjects:org.apache.chemistry.opencmis.client.runtime:org.apache.chemistry.opencmis.client.runtime.*:org.apache.chemistry.opencmis.commons.impl.jaxb:org.apache.chemistry.opencmis.client.bindings.impl:org.apache.chemistry.opencmis.client.bindings.cache:org.apache.chemistry.opencmis.client.bindings.spi:org.apache.chemistry.opencmis.server.impl:org.apache.chemistry.opencmis.fit:org.apache.chemistry.opencmis.util.repository:org.apache.chemistry.opencmis.fileshare:org.apache.chemistry.opencmis.inmemory:org.apache.chemistry.opencmis.browser:org.apache.chemistry.opencmis.commander</excludePackageNames>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
@@ -422,6 +393,52 @@
                 <artifactId>maven-project-info-reports-plugin</artifactId>
                 <version>2.0.1</version>
             </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-javadoc-plugin</artifactId>
+              <version>2.7</version>
+              <inherited>false</inherited>
+              <reportSets>
+                <reportSet>
+                  <id>aggregate</id>
+                  <reports>
+                    <report>aggregate</report>
+                  </reports>
+                </reportSet>
+              </reportSets>
+              <configuration>
+                  <doctitle>Apache Chemistry OpenCMIS ${project.version}</doctitle>
+                  <windowtitle>Apache Chemistry OpenCMIS ${project.version}</windowtitle>
+                  <!-- TODO: Update this for new packages -->
+                  <groups>
+                      <group>
+                          <title>OpenCMIS Client API</title>
+                          <packages>org.apache.chemistry.opencmis.client.api</packages>
+                      </group>
+                      <group>
+                          <title>OpenCMIS Commons API</title>
+                          <packages>org.apache.chemistry.opencmis.commons:org.apache.chemistry.opencmis.commons.*</packages>
+                      </group>
+                      <group>
+                          <title>OpenCMIS Bindings SPI</title>
+                          <packages>org.apache.chemistry.opencmis.client.bindings</packages>
+                      </group>
+                      <group>
+                          <title>OpenCMIS Server</title>
+                          <packages>org.apache.chemistry.opencmis.commons.server:org.apache.chemistry.opencmis.commons.impl.server:org.apache.chemistry.opencmis.server.support:org.apache.chemistry.opencmis.server.support.query</packages>
+                      </group>
+                      <group>
+                          <title>OpenCMIS Workbench</title>
+                          <packages>>org.apache.chemistry.opencmis.workbench</packages>
+                      </group>
+                      <group>
+                          <title>OpenCMIS TCK</title>
+                          <packages>>org.apache.chemistry.opencmis.tck</packages>
+                      </group>
+                    </groups>
+                    <excludePackageNames>org.apache.chemistry.opencmis.commons.impl:org.apache.chemistry.opencmis.commons.impl.dataobjects:org.apache.chemistry.opencmis.client.runtime:org.apache.chemistry.opencmis.client.runtime.*:org.apache.chemistry.opencmis.commons.impl.jaxb:org.apache.chemistry.opencmis.client.bindings.impl:org.apache.chemistry.opencmis.client.bindings.cache:org.apache.chemistry.opencmis.client.bindings.spi:org.apache.chemistry.opencmis.server.impl:org.apache.chemistry.opencmis.fit:org.apache.chemistry.opencmis.util.repository:org.apache.chemistry.opencmis.fileshare:org.apache.chemistry.opencmis.inmemory:org.apache.chemistry.opencmis.browser:org.apache.chemistry.opencmis.commander</excludePackageNames>
+                </configuration>
+            </plugin>
         </plugins>
     </reporting>
 
@@ -458,7 +475,7 @@
                                         <argument>-k</argument>
                                         <argument>-np</argument>
                                         <argument>--include-directories=/java/${version}</argument>
-                                        <argument>--exclude-directories=/java/${version}/javadoc/,/java/${version}/maven-site/</argument>
+                                        <argument>--exclude-directories=/java/${version}/maven/</argument>
                                         <argument>${docs.start.url}</argument>
                                     </arguments>
                                 </configuration>
@@ -470,6 +487,7 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
                         <version>2.7</version>
+                        <inherited>false</inherited>
                         <executions>
                             <execution>
                                 <id>generate-docs</id>
@@ -513,7 +531,6 @@
                                     <supplementalModels>
                                         <supplementalModel>${parentBasedir}/src/main/appended-resources/supplemental-models.xml</supplementalModel>
                                     </supplementalModels>
-                                    <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
                                 </configuration>
                             </execution>
                         </executions>

Modified: chemistry/opencmis/trunk/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/src/site/apt/index.apt?rev=1076688&r1=1076687&r2=1076688&view=diff
==============================================================================
--- chemistry/opencmis/trunk/src/site/apt/index.apt (original)
+++ chemistry/opencmis/trunk/src/site/apt/index.apt Thu Mar  3 17:15:32 2011
@@ -20,31 +20,20 @@
 ~~
 
   -----
-  OpenCMIS
+  Chemistry OpenCMIS
   -----
 
-OpenCMIS
+Chemistry OpenCMIS
   
-  OpenCMIS is an open source implementation of the 
-  {{{http://xml.coverpages.org/cmis.html}OASIS CMIS specification}}
+  OpenCMIS is an open source implementation of the  {{{http://xml.coverpages.org/cmis.html}OASIS
CMIS specification}}
   for Java.
 
-  The project consists of the following parts:
-  
-  * <<CMIS Client>>
-  
-    * {{{./client-api.html}Client API}}
+  User and developer documentation for OpenCMIS is available in the main {{{http://chemistry.apache.org/java/opencmis.html}Chemistry
website}}
 
-    * {{{./client-binding.html}Client Binding Layer}}
+  In this site you can find instead OpenCMIS developer information for this version (see
top right corner) like:
 
-  * <<CMIS Server>>
-  
-    * {{{./server.html}Server Framework}}
-	
-    * {{{./server-inmemory.html}InMemory Test Repository}}
-	
-    * {{{./server-fileshare.html}FileShare Test Repository}}
-  
-  * <<Tests and Tools>>
-    
-	* {{{./browser.html}CMIS Browser}}
+  * Info for all OpenCMIS modules available in this release (see menu on the left)
+
+  * {{{./apidocs/index.html} Full JavaDocs}}
+
+  * {{{./surefire-report.html} Aggregated unit + integration test reports}} for the full
OpenCMIS framework
\ No newline at end of file

Modified: chemistry/opencmis/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/src/site/site.xml?rev=1076688&r1=1076687&r2=1076688&view=diff
==============================================================================
--- chemistry/opencmis/trunk/src/site/site.xml (original)
+++ chemistry/opencmis/trunk/src/site/site.xml Thu Mar  3 17:15:32 2011
@@ -19,18 +19,31 @@
 -->
 <project name="OpenCMIS">
 
-	<publishDate position="right" />
-	<version position="left" />
+	<publishDate position="left" />
+	<version position="right" />
 
-	<bannerRight>
+	<bannerLeft>
 		<name>${project.name}</name>
-		<src>http://chemistry.apache.org/images/apache-incubator-logo.png</src>
-		<href>http://www.apache.org/</href>
+		<src>images/chemistry-logo.png</src>
+		<href>http://chemistry.apache.org/</href>
+	</bannerLeft>
+
+    <bannerRight>
+		<name>The Apache Software Foundation</name>
+		<src>images/apache-logo.gif</src>
+		<href>http://chemistry.apache.org/</href>
 	</bannerRight>
-	
+
+
+    <poweredBy>
+      <logo name="Maven" href="http://maven.apache.org/"
+            img="http://maven.apache.org/images/logos/maven-feather.png"/>
+    </poweredBy>
+
+
 	<skin>
 		<groupId>org.apache.maven.skins</groupId>
-		<artifactId>maven-classic-skin</artifactId>
+		<artifactId>maven-default-skin</artifactId>
 	</skin>
 
 	<body>



Mime
View raw message