cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r219738 - in /cocoon/trunk: init.xargs src/java/Manifest.mf src/osgi-servlet/Manifest.mf tools/targets/osgi-build.xml
Date Tue, 19 Jul 2005 18:13:16 GMT
Author: reinhard
Date: Tue Jul 19 11:13:06 2005
New Revision: 219738

URL: http://svn.apache.org/viewcvs?rev=219738&view=rev
Log:
create template bundle

Modified:
    cocoon/trunk/init.xargs
    cocoon/trunk/src/java/Manifest.mf
    cocoon/trunk/src/osgi-servlet/Manifest.mf
    cocoon/trunk/tools/targets/osgi-build.xml

Modified: cocoon/trunk/init.xargs
URL: http://svn.apache.org/viewcvs/cocoon/trunk/init.xargs?rev=219738&r1=219737&r2=219738&view=diff
==============================================================================
--- cocoon/trunk/init.xargs (original)
+++ cocoon/trunk/init.xargs Tue Jul 19 11:13:06 2005
@@ -36,6 +36,7 @@
 ## Some library bundles
 -initlevel 2
 -install build/osgi/org.apache.cocoon_1.0.0.jar
+-install build/osgi/org.apache.cocoon.template_1.0.0.jar
 
 ## HTTP Service
 -initlevel 4

Modified: cocoon/trunk/src/java/Manifest.mf
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/Manifest.mf?rev=219738&r1=219737&r2=219738&view=diff
==============================================================================
--- cocoon/trunk/src/java/Manifest.mf (original)
+++ cocoon/trunk/src/java/Manifest.mf Tue Jul 19 11:13:06 2005
@@ -28,7 +28,11 @@
  org.apache.avalon.framework.context,
  org.apache.avalon.framework.logger,
  org.apache.avalon.framework.service,
+ org.apache.avalon.framework.activity,
+ org.apache.avalon.framework.thread,
+ org.apache.avalon.framework.configuration,
  org.apache.cocoon,
+ org.apache.cocoon.caching,
  org.apache.cocoon.components.blocks,
  org.apache.cocoon.components.classloader,
  org.apache.cocoon.components.fam,
@@ -37,7 +41,7 @@
  org.apache.cocoon.components.source,
  org.apache.cocoon.components.source.impl,
  org.apache.cocoon.components.treeprocessor,
- org.apache.cocoon.components.treeprocessor.sitemap,
+ org.apache.cocoon.components.treeprocessor.sitemap
  org.apache.cocoon.core,
  org.apache.cocoon.core.container,
  org.apache.cocoon.environment,
@@ -50,12 +54,23 @@
  org.apache.cocoon.transformation,
  org.apache.cocoon.util,
  org.apache.cocoon.util.log,
+ org.apache.cocoon.xml,
+ org.apache.cocoon.xml.dom,
  org.apache.avalon.excalibur.logger,
  org.apache.excalibur.source,
  org.apache.excalibur.source.impl,
  org.apache.excalibur.xml.impl,
+ org.apache.excalibur.xml.sax,   
  org.apache.excalibur.xml.xslt,
  org.apache.excalibur.xmlizer,
- org.apache.log
-Import-Package: org.osgi.framework
+ org.apache.log,
+ org.xml.sax,
+ org.apache.commons.lang,
+ org.apache.excalibur.store,
+ org.apache.cocoon.components.source,
+ org.apache.cocoon.components.flow,
+ org.apache.commons.jxpath
+Import-Package: 
+ org.osgi.framework
+DynamicImport-Package: org.apache.cocoon.*
 Bundle-UUID: org.apache.cocoon:cocoon:1.0.0:all

Modified: cocoon/trunk/src/osgi-servlet/Manifest.mf
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/osgi-servlet/Manifest.mf?rev=219738&r1=219737&r2=219738&view=diff
==============================================================================
--- cocoon/trunk/src/osgi-servlet/Manifest.mf (original)
+++ cocoon/trunk/src/osgi-servlet/Manifest.mf Tue Jul 19 11:13:06 2005
@@ -10,9 +10,14 @@
 Bundle-ContactAddress: http://cocoon.apache.org
 Bundle-Activator: org.apache.cocoon.service.servlet.impl.Activator
 Bundle-Category: servlet
-Import-Package: javax.servlet,javax.servlet.http,org.apache.cocoon.ser
- vlet,org.osgi.framework,org.osgi.service.http,org.osgi.service.log,or
- g.osgi.util.tracker
+Import-Package: 
+ javax.servlet,
+ javax.servlet.http,
+ org.apache.cocoon.servlet,
+ org.osgi.framework,
+ org.osgi.service.http,
+ org.osgi.service.log,
+ org.osgi.util.tracker
 Bundle-UUID: org.apache.cocoon:cocoon_servlet:1.0.0:impl
 Built-From: C:\cygwin\usr\local\svn\cocoon\osgi\bundles\cocoon_servlet
 Build-Date: Fri July 15 2005, 22:46:00

Modified: cocoon/trunk/tools/targets/osgi-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/osgi-build.xml?rev=219738&r1=219737&r2=219738&view=diff
==============================================================================
--- cocoon/trunk/tools/targets/osgi-build.xml (original)
+++ cocoon/trunk/tools/targets/osgi-build.xml Tue Jul 19 11:13:06 2005
@@ -23,21 +23,28 @@
     <property name="build.osgi" value="${build.root}/osgi"/>
     <property name="build.osgi.webapp" value="${build.osgi}/webapp"/>
     <property name="build.osgi.servlet" value="${build.osgi}/osgi-servlet"/>    
+    <property name="build.osgi.blocks" value="${build.osgi}/blocks"/>
+    <property name="build.osgi.blocks.template" value="${build.osgi.blocks}/template"/>
+    
     <property name="build.osgi.bundles.cocoon" value="org.apache.cocoon_1.0.0.jar"/>
     <property name="build.osgi.bundles.cocoon_webapp" value="org.apache.cocoon_webapp_1.0.0.jar"/>
     <property name="build.osgi.bundles.cocoon_servlet" value="org.apache.cocoon_servlet_1.0.0.jar"/>
   
+    <property name="build.osgi.bundles.template" value="org.apache.cocoon.template_1.0.0.jar"/>
       
     <property name="build.osgi.knopflerfish.fwdir" value="fwdir"/>
 
     <property name="lib.osgi" value="${lib}/osgi"/>
     
     <property name="src.osgi.servlet" value="${src}/osgi-servlet"/>
+    <property name="src.blocks.template" value="${blocks}/template/trunk/java"/>  
 
     
     <mkdir dir="${build.osgi}"/>
-    <mkdir dir="${build.osgi.servlet}"/>
-    <mkdir dir="${build.osgi.webapp}"/>    
+    <mkdir dir="${build.osgi.servlet}"/>    
+    <mkdir dir="${build.osgi.webapp}"/>  
+    <mkdir dir="${build.osgi.blocks}"/>  
+    <mkdir dir="${build.osgi.blocks.template}"/>      
   </target>
   
-  <target name="osgi" depends="osgi.init, compile-core, osgi.compile-osgi-servlet, osgi.prepare-webapp,
osgi.bundling" 
+  <target name="osgi" depends="osgi.bundling" 
     description="Setup Cocoon to run within OSGi containers">
   </target>
   
@@ -56,7 +63,6 @@
       <pathelement location="${lib.core}/servlet-2_3.jar"/>
     </path>    
     
-    <mkdir dir="${build.osgi.servlet}"/>
     <javac 
       debug="${compiler.debug}"
       optimize="${compiler.optimize}"
@@ -91,6 +97,15 @@
     <copy todir="${build.osgi.webapp}/samples" filtering="off">
       <fileset dir="${webapp}/samples"/>
     </copy>    
+    
+    <!--
+    <delete>
+      <fileset dir="${build.osgi.webapp}/WEB-INF">
+        <include name="cocoon.xconf"/>
+        <include name="logkit.xconf"/>
+      </fileset>      
+    </delete>
+    -->  
       
     <copy todir="${build.osgi.webapp}/WEB-INF" filtering="on">
       <fileset dir="${webapp}/WEB-INF">
@@ -118,10 +133,64 @@
       <replacevalue><![CDATA[<!-- excluded by the OSGi Ant task!!!!
         include dir="context://WEB-INF/xconf" pattern="*.logkit"/-->]]></replacevalue>
     </replace>
+
+    <replace file="${build.osgi.webapp}/WEB-INF/cocoon.xconf">
+      <replacetoken><![CDATA[</cocoon>]]></replacetoken>
+      <replacevalue><![CDATA[<!-- included by the OSGi Ant task!!!! -->
+          <include src="resource://org/apache/cocoon/components/expression/expression.roles"/>
+          <component role="org.apache.cocoon.template.script.ScriptManager" class="org.apache.cocoon.template.script.DefaultScriptManager"/>
+          <component role="org.apache.cocoon.template.script.InstructionFactory" class="org.apache.cocoon.template.script.DefaultInstructionFactory"/>
     
+          <expression-compilers>
+            <component-instance class="org.apache.cocoon.components.expression.jxpath.JXPathCompiler"
name="default"/>
+            <component-instance class="org.apache.cocoon.components.expression.jexl.JexlCompiler"
name="jexl"/>
+            <component-instance class="org.apache.cocoon.components.expression.jxpath.JXPathCompiler"
name="jxpath"/>
+          </expression-compilers>
+        </cocoon>]]></replacevalue>
+    </replace>          
     
   </target>
   
-  <target name="osgi.bundling">    
+  <target name="osgi.block.template">
+    <path id="osgi.blocks.template.classpath">
+      <fileset dir="${lib.core}">
+        <include name="*.jar"/>
+      </fileset>   
+      <fileset dir="${lib.endorsed}">
+        <include name="*.jar"/>
+      </fileset>         
+      <fileset dir="${lib.osgi}">
+        <include name="*/*.jar"/>
+      </fileset>          
+      <!-- include Cocoon core -->
+      <dirset dir="${build.dest}"/>
+    </path>    
+    
+    <javac 
+      debug="${compiler.debug}"
+      optimize="${compiler.optimize}"
+      deprecation="${compiler.deprecation}"
+      target="${target.vm}"
+      source="${source.vm}"
+      nowarn="${compiler.nowarn}"
+      compiler="${compiler}"
+      srcdir="${src.blocks.template}"    
+      destdir="${build.osgi.blocks.template}"  
+      classpathref="osgi.blocks.template.classpath"/> 
+       
+    <copy todir="${build.osgi.blocks.template}" filtering="off">
+      <fileset dir="${src.blocks.template}">
+        <include name="**/*.roles"/>
+        <include name="**/*.xml"/>        
+      </fileset>
+    </copy>
+    
+  </target>
+  
+  <target name="osgi.bundling" depends="osgi.init, compile-core, osgi.compile-osgi-servlet,
osgi.prepare-webapp, osgi.block.template"> 
+    
+    <!-- note: packaging OSGI packages is only provisional; of course we will need a more
generic build system in the future -->
+  
+    <!-- the Cocoon core bundle -->
     <jar file="${build.osgi}/${build.osgi.bundles.cocoon}" manifest="${build.dest}/Manifest.mf">
       <fileset dir="${build.dest}/">
         <exclude name="Manifest.mf"/>
@@ -134,11 +203,17 @@
         <include name="*.jar"/>
       </fileset>      
     </jar>
+    <!-- the Cocoon webapp bundle -->
     <jar file="${build.osgi}/${build.osgi.bundles.cocoon_webapp}" manifest="${webapp}/Manifest.mf">
       <fileset dir="${build.osgi.webapp}"/>
-    </jar>    
-    <jar file="${build.osgi}/${build.osgi.bundles.cocoon_servlet}" manifest="${src.osgi.servlet}/Manifest.mf">
+    </jar>
+    <!-- the osgi-servlet bundle -->
+    <jar file="${build.osgi}/${build.osgi.bundles.cocoon_servlet}" manifest="${src.osgi.servlet}/Manifest.mf">
       <fileset dir="${build.osgi.servlet}"/>
+    </jar>
+    <!-- the templating bundle -->
+    <jar file="${build.osgi}/${build.osgi.bundles.template}" manifest="${src.blocks.template}/Manifest.mf">
+      <fileset dir="${build.osgi.blocks.template}"/>
     </jar>
   </target>
 



Mime
View raw message