You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by il...@apache.org on 2012/05/29 11:33:17 UTC

svn commit: r1343625 - in /cocoon/subprojects/cocoon-jnet/trunk: ./ src/site/ src/site/resources/ src/site/resources/images/ src/site/xdoc/

Author: ilgrosso
Date: Tue May 29 09:33:16 2012
New Revision: 1343625

URL: http://svn.apache.org/viewvc?rev=1343625&view=rev
Log:
Adding site generation to own subproject

Added:
    cocoon/subprojects/cocoon-jnet/trunk/src/site/
    cocoon/subprojects/cocoon-jnet/trunk/src/site/resources/
    cocoon/subprojects/cocoon-jnet/trunk/src/site/resources/images/
    cocoon/subprojects/cocoon-jnet/trunk/src/site/resources/images/external.png   (with props)
    cocoon/subprojects/cocoon-jnet/trunk/src/site/site.xml   (with props)
    cocoon/subprojects/cocoon-jnet/trunk/src/site/xdoc/
    cocoon/subprojects/cocoon-jnet/trunk/src/site/xdoc/download_1_1.xml   (with props)
    cocoon/subprojects/cocoon-jnet/trunk/src/site/xdoc/download_1_2.xml   (with props)
    cocoon/subprojects/cocoon-jnet/trunk/src/site/xdoc/index.xml   (with props)
Modified:
    cocoon/subprojects/cocoon-jnet/trunk/pom.xml

Modified: cocoon/subprojects/cocoon-jnet/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-jnet/trunk/pom.xml?rev=1343625&r1=1343624&r2=1343625&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-jnet/trunk/pom.xml (original)
+++ cocoon/subprojects/cocoon-jnet/trunk/pom.xml Tue May 29 09:33:16 2012
@@ -38,7 +38,7 @@
 
   <properties>
     <docs.name>${project.name}</docs.name>
-    <docs.version>${docs.m.jnet.version}</docs.version>
+    <docs.version>1.2</docs.version>
     <docs.urlRelativizer>../../../</docs.urlRelativizer>
     <docs.breadcrumb>subproject</docs.breadcrumb>
   </properties>
@@ -59,8 +59,15 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-configuration-api</artifactId>
+      <version>1.0.2</version>
+      <scope>runtime</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-spring-configurator</artifactId>
-      <version>2.2.1-SNAPSHOT</version>
+      <version>2.1.0</version>
       <scope>runtime</scope>
       <optional>true</optional>
     </dependency>
@@ -99,6 +106,59 @@
   </dependencies>
 
   <build>
+
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>3.0</version>
+        <configuration>
+          <locales>en</locales>
+          <reportPlugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-project-info-reports-plugin</artifactId>
+              <version>2.4</version>
+              <configuration>
+                <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+                <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+              </configuration>
+              <reportSets>
+                <reportSet>
+                  <reports>
+                    <report>dependencies</report>
+                    <report>license</report>
+                    <report>summary</report>
+                    <report>project-team</report>
+                  </reports>
+                </reportSet>
+              </reportSets>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-changes-plugin</artifactId>
+              <version>2.7.1</version>
+              <reportSets>
+                <reportSet>
+                  <reports>
+                    <report>changes-report</report>
+                  </reports>
+                </reportSet>
+              </reportSets>
+            </plugin>
+          </reportPlugins>
+        </configuration>
+        <executions>
+          <execution>
+            <id>attach-descriptor</id>
+            <goals>
+              <goal>attach-descriptor</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    
     <resources>
       <resource>
         <directory>src/main/resources</directory>
@@ -114,24 +174,5 @@
       </resource>
     </resources>
   </build>
-
-  <reporting>
-    <plugins>
-      <plugin>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.0.1</version>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>project-team</report>
-              <report>dependencies</report>
-              <report>license</report>
-              <report>summary</report>
-              <report>index</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-    </plugins>
-  </reporting>
+  
 </project>

Added: cocoon/subprojects/cocoon-jnet/trunk/src/site/resources/images/external.png
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-jnet/trunk/src/site/resources/images/external.png?rev=1343625&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/subprojects/cocoon-jnet/trunk/src/site/resources/images/external.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: cocoon/subprojects/cocoon-jnet/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-jnet/trunk/src/site/site.xml?rev=1343625&view=auto
==============================================================================
--- cocoon/subprojects/cocoon-jnet/trunk/src/site/site.xml (added)
+++ cocoon/subprojects/cocoon-jnet/trunk/src/site/site.xml Tue May 29 09:33:16 2012
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<!-- $Id$ -->
+<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd"
+         name="Cocoon">
+
+  <skin>
+    <groupId>org.apache.cocoon</groupId>
+    <artifactId>cocoon-thien-maven-site-skin</artifactId>
+    <version>1.0.1</version>
+  </skin>
+    
+  <body>
+    <menu name="Cocoon JNet">
+      <item name="Overview" href="./index.html"/>
+<!--      <item name="Download 1.2" href="./download_1_2.html"/>-->
+      <item name="Download 1.1" href="./download_1_1.html"/>
+    </menu>
+
+    <menu ref="reports" inherit="bottom"/>
+  </body>
+</project>

Propchange: cocoon/subprojects/cocoon-jnet/trunk/src/site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/subprojects/cocoon-jnet/trunk/src/site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: cocoon/subprojects/cocoon-jnet/trunk/src/site/site.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cocoon/subprojects/cocoon-jnet/trunk/src/site/xdoc/download_1_1.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-jnet/trunk/src/site/xdoc/download_1_1.xml?rev=1343625&view=auto
==============================================================================
--- cocoon/subprojects/cocoon-jnet/trunk/src/site/xdoc/download_1_1.xml (added)
+++ cocoon/subprojects/cocoon-jnet/trunk/src/site/xdoc/download_1_1.xml Tue May 29 09:33:16 2012
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+      Licensed to the Apache Software Foundation (ASF) under one
+      or more contributor license agreements.  See the NOTICE file
+      distributed with this work for additional information
+      regarding copyright ownership.  The ASF licenses this file
+      to you under the Apache License, Version 2.0 (the
+      "License"); you may not use this file except in compliance
+      with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing,
+      software distributed under the License is distributed on an
+      "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+      KIND, either express or implied.  See the License for the
+      specific language governing permissions and limitations
+      under the License.
+    --><document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/XDOC/2.0" xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd"><properties><title>Cocoon JNet - Download</title><author email="cocoon-docs@apache.org">Apache Cocoon Documentation Team</author></properties><body>
+         <div id="contentBody"><div id="bodyText"><h1 class="docTitle">Download</h1><table class="bodyTable">
+<tbody>
+<tr class="a">
+<th>
+<p>Artifact</p>
+</th>
+<th>
+<p>Description</p>
+</th>
+<th>
+<p>Download</p>
+</th>
+<th>
+<p>Veri</p>
+</th>
+</tr>
+<tr class="b">
+<td>
+<p><strong>Cocoon JNet 1.1.0</strong></p>
+</td>
+<td>
+<p>sources, binaries, javadocs, docs</p>
+</td>
+<td>
+<p>
+<a href="http://www.apache.org/dyn/closer.cgi/cocoon/subprojects/jnet/cocoon-jnet-1.1.0.zip">cocoon-jnet-1.1.0.zip</a>
+<br/>
+<a href="http://www.apache.org/dyn/closer.cgi/cocoon/subprojects/jnet/cocoon-jnet-1.1.0.tar.gz">
+cocoon-jnet-1.1.0.tar.gz</a></p>
+</td>
+<td>
+<p>
+<a href="http://www.apache.org/dist/cocoon/subprojects/jnet/cocoon-jnet-1.1.0.zip.asc">pgp</a>
+<a href="http://www.apache.org/dist/cocoon/subprojects/jnet/cocoon-jnet-1.1.0.zip.md51">md5</a>
+<a href="http://www.apache.org/dist/cocoon/subprojects/jnet/cocoon-jnet-1.1.0.zip.sha1">sha1</a>
+<br/>
+<a href="http://www.apache.org/dist/cocoon/subprojects/jnet/cocoon-jnet-1.1.0.tar.gz.asc">
+pgp</a>
+<a href="http://www.apache.org/dist/cocoon/subprojects/jnet/cocoon-jnet-1.1.0.tar.gz.md5">md5</a>
+<a href="http://www.apache.org/dist/cocoon/subprojects/jnet/cocoon-jnet-1.1.0.tar.gz.sha1">sha1</a>
+</p>
+</td>
+</tr>
+<tr class="a"> 
+</tr>
+</tbody>
+</table><h1>Maven 2 Dependency</h1><p>Add following dependency to your pom.xml file:</p><pre>&lt;dependency&gt;
+  &lt;groupId&gt;org.apache.cocoon&lt;/groupId&gt;
+  &lt;artifactId&gt;cocoon-jnet&lt;/artifactId&gt;
+  &lt;version&gt;1.1.0&lt;/version&gt;
+&lt;/dependency&gt;
+</pre></div></div>
+       </body></document>
\ No newline at end of file

Propchange: cocoon/subprojects/cocoon-jnet/trunk/src/site/xdoc/download_1_1.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/subprojects/cocoon-jnet/trunk/src/site/xdoc/download_1_1.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: cocoon/subprojects/cocoon-jnet/trunk/src/site/xdoc/download_1_1.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cocoon/subprojects/cocoon-jnet/trunk/src/site/xdoc/download_1_2.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-jnet/trunk/src/site/xdoc/download_1_2.xml?rev=1343625&view=auto
==============================================================================
--- cocoon/subprojects/cocoon-jnet/trunk/src/site/xdoc/download_1_2.xml (added)
+++ cocoon/subprojects/cocoon-jnet/trunk/src/site/xdoc/download_1_2.xml Tue May 29 09:33:16 2012
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+      Licensed to the Apache Software Foundation (ASF) under one
+      or more contributor license agreements.  See the NOTICE file
+      distributed with this work for additional information
+      regarding copyright ownership.  The ASF licenses this file
+      to you under the Apache License, Version 2.0 (the
+      "License"); you may not use this file except in compliance
+      with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing,
+      software distributed under the License is distributed on an
+      "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+      KIND, either express or implied.  See the License for the
+      specific language governing permissions and limitations
+      under the License.
+    --><document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/XDOC/2.0" xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd"><properties><title>Cocoon JNet - Download</title><author email="cocoon-docs@apache.org">Apache Cocoon Documentation Team</author></properties><body>
+         <div id="contentBody"><div id="bodyText"><h1 class="docTitle">Download</h1><table class="bodyTable">
+<tbody>
+<tr class="a">
+<th>
+<p>Artifact</p>
+</th>
+<th>
+<p>Description</p>
+</th>
+<th>
+<p>Download</p>
+</th>
+<th>
+<p>Veri</p>
+</th>
+</tr>
+<tr class="b">
+<td>
+<p><strong>Cocoon JNet 1.2.0</strong></p>
+</td>
+<td>
+<p>sources, binaries, javadocs, docs</p>
+</td>
+<td>
+<p>
+<a href="http://www.apache.org/dyn/closer.cgi/cocoon/subprojects/jnet/cocoon-jnet-1.2.0.zip">cocoon-jnet-1.2.0.zip</a>
+<br/>
+<a href="http://www.apache.org/dyn/closer.cgi/cocoon/subprojects/jnet/cocoon-jnet-1.2.0.tar.gz">
+cocoon-jnet-1.2.0.tar.gz</a></p>
+</td>
+<td>
+<p>
+<a href="http://www.apache.org/dyn/closer.cgi/cocoon/subprojects/jnet/cocoon-jnet-1.2.0.zip.asc">pgp</a>
+<a href="http://www.apache.org/dyn/closer.cgi/cocoon/subprojects/jnet/cocoon-jnet-1.2.0.zip.md5">md5</a>
+<a href="http://www.apache.org/dyn/closer.cgi/cocoon/subprojects/jnet/cocoon-jnet-1.2.0.zip.sha1">sha1</a>
+<br/>
+<a href="http://www.apache.org/dyn/closer.cgi/cocoon/subprojects/jnet/cocoon-jnet-1.2.0.tar.gz.asc">
+pgp</a>
+<a href="http://www.apache.org/dyn/closer.cgi/cocoon/subprojects/jnet/cocoon-jnet-1.2.0.tar.gz.md5">md5</a>
+<a href="http://www.apache.org/dyn/closer.cgi/cocoon/subprojects/jnet/cocoon-jnet-1.2.0.tar.gz.sha1">sha1</a>
+</p>
+</td>
+</tr>
+<tr class="a"> 
+</tr>
+</tbody>
+</table><h1>Maven 2 Dependency</h1><p>Add following dependency to your pom.xml file:</p><pre>&lt;dependency&gt;
+  &lt;groupId&gt;org.apache.cocoon&lt;/groupId&gt;
+  &lt;artifactId&gt;cocoon-jnet&lt;/artifactId&gt;
+  &lt;version&gt;1.2.0&lt;/version&gt;
+&lt;/dependency&gt;
+</pre></div></div>
+       </body></document>
\ No newline at end of file

Propchange: cocoon/subprojects/cocoon-jnet/trunk/src/site/xdoc/download_1_2.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/subprojects/cocoon-jnet/trunk/src/site/xdoc/download_1_2.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: cocoon/subprojects/cocoon-jnet/trunk/src/site/xdoc/download_1_2.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cocoon/subprojects/cocoon-jnet/trunk/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-jnet/trunk/src/site/xdoc/index.xml?rev=1343625&view=auto
==============================================================================
--- cocoon/subprojects/cocoon-jnet/trunk/src/site/xdoc/index.xml (added)
+++ cocoon/subprojects/cocoon-jnet/trunk/src/site/xdoc/index.xml Tue May 29 09:33:16 2012
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+      Licensed to the Apache Software Foundation (ASF) under one
+      or more contributor license agreements.  See the NOTICE file
+      distributed with this work for additional information
+      regarding copyright ownership.  The ASF licenses this file
+      to you under the Apache License, Version 2.0 (the
+      "License"); you may not use this file except in compliance
+      with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing,
+      software distributed under the License is distributed on an
+      "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+      KIND, either express or implied.  See the License for the
+      specific language governing permissions and limitations
+      under the License.
+    --><document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/XDOC/2.0" xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd"><properties><title>Cocoon JNet - Overview</title><author email="cocoon-docs@apache.org">Apache Cocoon Documentation Team</author></properties><body>
+         <div id="contentBody"><div id="bodyText"><h1 class="docTitle">Overview</h1><p>Cocoon JNet allows the dynamic registration of URLStreamHandler factories
+with your JVM. That's a feature that isn't supported by Java itself.</p><h1>Plain Java usage</h1><p>The class <tt>org.apache.cocoon.jnet.DynamicURLStreamHandlerFactory</tt> can
+be used to install more than one
+<a href="http://java.sun.com/j2se/1.5.0/docs/api/java/net/class-use/URLStreamHandlerFactory.html">URLStreamHandlerFactory</a>
+and is registered at the JVM by using<tt>
+org.apache.cocoon.jnet.URLStreamHandlerFactoryInstaller</tt>.</p><p>After registering your own URLStreamHandler, you can use the new protocols
+for java.net.URL objects:</p><pre>java.net.URL url = new java.net.URL("myprotocol:/a/b/c");
+</pre><h1>Spring integration</h1><p>By using the <a href="../../../subprojects/configuration/1.0/spring-configurator/2.1/1304_1_1.html">Cocoon Spring-Configurator</a> all beans of
+type <tt>java.net.URLStreamHandlerFactory</tt> can be collected:</p><pre>&lt;bean id="org.apache.cocoon.jnet.URLHandlerFactoryCollector" 
+  class="org.apache.cocoon.jnet.URLHandlerFactoryCollector"&gt;
+  &lt;property name="urlHandlerFactories"&gt;
+    &lt;configurator:bean-map type="java.net.URLStreamHandlerFactory" 
+      strip-prefix="true" /&gt;
+  &lt;/property&gt;
+&lt;/bean&gt;
+</pre><p>The URLHandlerFactoryCollector is implemented as an around advice. The code
+that wants to use the registred protocols only has to be wrapped by this advice.
+The Cocoon Servlet-Service framework uses it to intercept all calls of the
+service method of any of its servlets:</p><pre>&lt;aop:config&gt;
+  &lt;aop:aspect id="installURL" ref="org.apache.cocoon.jnet.URLHandlerFactoryCollector"&gt;
+    &lt;aop:pointcut id="servletServiceInvocation"
+      expression="execution(* javax.servlet.Servlet.service(..)) and bean(*/embedded)" /&gt;
+    &lt;aop:around pointcut-ref="servletServiceInvocation" method="installURLHandlers" /&gt;
+  &lt;/aop:aspect&gt;
+&lt;/aop:config&gt;
+</pre></div></div>
+       </body></document>
\ No newline at end of file

Propchange: cocoon/subprojects/cocoon-jnet/trunk/src/site/xdoc/index.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/subprojects/cocoon-jnet/trunk/src/site/xdoc/index.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: cocoon/subprojects/cocoon-jnet/trunk/src/site/xdoc/index.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml