cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r374164 - in /cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo: ./ src/main/java/COB-INF/ src/main/resources/COB-INF/ src/main/resources/META-INF/
Date Wed, 01 Feb 2006 20:36:36 GMT
Author: reinhard
Date: Wed Feb  1 12:36:27 2006
New Revision: 374164

URL: http://svn.apache.org/viewcvs?rev=374164&view=rev
Log:
fix all wrong settings,paths, etc. --> it works now: just call 'mvn cocoon:deploy jetty6:run';
 move all non Java files into main/resources, add the stiemap servlet to block.xml, configure
Jetty in pom.xml

Added:
    cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/COB-INF/
      - copied from r373857, cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/java/COB-INF/
    cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/COB-INF/sitemap.xmap
      - copied, changed from r374163, cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/java/COB-INF/sitemap.xmap
    cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/COB-INF/test.xml
      - copied, changed from r374163, cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/java/COB-INF/test.xml
Removed:
    cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/java/COB-INF/
Modified:
    cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/   (props changed)
    cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/pom.xml
    cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/META-INF/block.xml

Propchange: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Feb  1 12:36:27 2006
@@ -3,3 +3,4 @@
 .project
 .wtpmodules
 target
+work

Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/pom.xml?rev=374164&r1=374163&r2=374164&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/pom.xml (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/pom.xml Wed Feb  1 12:36:27
2006
@@ -41,6 +41,29 @@
         <artifactId>cocoon-deployer-plugin</artifactId>
         <version>1.0-SNAPSHOT</version>
       </plugin>
+      
+      <plugin>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>maven-jetty6-plugin</artifactId>
+        <version>6.0-SNAPSHOT</version>
+        <configuration>
+          <connectors>
+            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+              <port>8888</port>
+              <maxIdleTime>30000</maxIdleTime>
+            </connector>
+          </connectors>
+          <webAppSourceDirectory>target/cocoon-webapp</webAppSourceDirectory>
+          <contextPath>/</contextPath>
+          <systemProperties>
+            <systemProperty>
+              <name>org.apache.commons.logging.Log</name>
+              <value>org.apache.commons.logging.impl.SimpleLog</value>
+            </systemProperty>
+          </systemProperties>
+        </configuration>
+      </plugin>      
+      
       <!--plugin>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
@@ -51,12 +74,20 @@
   </build>  
   
   <dependencies>
+    <!-- just a test dependency -->
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
       <version>1.1</version>
       <scope>compile</scope>
     </dependency>
-  </dependencies>
+    <!-- this is just a runtime dependency for the Jetty6 plugin - I (rpoetz) don't understand
+         why the plugin requires it as it is added to WEB-INF/lib by the deployer ... -->
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-blocks-fw-impl</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>  
   
 </project>

Copied: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/COB-INF/sitemap.xmap
(from r374163, cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/java/COB-INF/sitemap.xmap)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/COB-INF/sitemap.xmap?p2=cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/COB-INF/sitemap.xmap&p1=cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/java/COB-INF/sitemap.xmap&r1=374163&r2=374164&rev=374164&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/java/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/COB-INF/sitemap.xmap
Wed Feb  1 12:36:27 2006
@@ -15,12 +15,53 @@
   limitations under the License.
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+  
+  <map:components xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+    <map:generators default="file">
+      <map:generator label="content" logger="sitemap.generator.file" name="file" pool-max="32"
+        src="org.apache.cocoon.generation.FileGenerator"/>
+    </map:generators>
+    <map:transformers default="xslt">
+      <map:transformer logger="sitemap.transformer.xslt" name="xslt" pool-max="32"
+        src="org.apache.cocoon.transformation.TraxTransformer">
+        <use-request-parameters>false</use-request-parameters>
+        <use-session-parameters>false</use-session-parameters>
+        <use-cookie-parameters>false</use-cookie-parameters>
+        <xslt-processor-role>xalan</xslt-processor-role>
+        <check-includes>true</check-includes>
+      </map:transformer>
+    </map:transformers>
+    <map:serializers default="html">
+      <map:serializer logger="sitemap.serializer.xml" mime-type="text/xml" name="xml"
+        src="org.apache.cocoon.serialization.XMLSerializer"/>
+      <map:serializer logger="sitemap.serializer.html" mime-type="text/html" name="html"
pool-max="32"
+        src="org.apache.cocoon.serialization.HTMLSerializer">
+        <doctype-public>-//W3C//DTD HTML 4.01 Transitional//EN</doctype-public>
+        <doctype-system>http://www.w3.org/TR/html4/loose.dtd</doctype-system>
+      </map:serializer>
+    </map:serializers>
+    <map:readers default="resource">
+      <map:reader logger="sitemap.reader.resource" name="resource" pool-max="32"
+        src="org.apache.cocoon.reading.ResourceReader"/>
+      <map:reader logger="sitemap.reader.image" name="image" src="org.apache.cocoon.reading.ImageReader"/>
+    </map:readers>
+    <map:matchers default="wildcard">
+      <map:matcher logger="sitemap.matcher.wildcard" name="wildcard" src="org.apache.cocoon.matching.WildcardURIMatcher"/>
+    </map:matchers>
+    <map:pipes default="caching">
+      <map:pipe name="caching" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
+      <map:pipe name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
+    </map:pipes>
+  </map:components>
+  
   <map:pipelines>
     <map:pipeline>
       <map:match pattern="test">
         <map:generate src="test.xml"/>
-        <map:serialize/>
+        <map:serialize type="xml"/>
       </map:match>
     </map:pipeline>
   </map:pipelines>
+  
 </map:sitemap>
+

Copied: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/COB-INF/test.xml
(from r374163, cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/java/COB-INF/test.xml)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/COB-INF/test.xml?p2=cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/COB-INF/test.xml&p1=cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/java/COB-INF/test.xml&r1=374163&r2=374164&rev=374164&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/java/COB-INF/test.xml
(original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/COB-INF/test.xml
Wed Feb  1 12:36:27 2006
@@ -14,4 +14,4 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<test/>
\ No newline at end of file
+<test>cocoon-deployer-plugin-demo</test>
\ No newline at end of file

Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/META-INF/block.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/META-INF/block.xml?rev=374164&r1=374163&r2=374164&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/META-INF/block.xml
(original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/META-INF/block.xml
Wed Feb  1 12:36:27 2006
@@ -27,5 +27,7 @@
          implementation="unstable"/>
   <license href="http://www.apache.org/licenses/">Apache License 2.0</license>
   <author href="http://cocoon.apache.org">Apache Cocoon community</author>
-  
+  <servlet class="org.apache.cocoon.sitemap.SitemapServlet">
+    <sitemap file="COB-INF/sitemap.xmap"/>
+  </servlet>  
 </block>



Mime
View raw message