You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by da...@apache.org on 2005/06/26 23:42:30 UTC
svn commit: r201911 - in /cocoon/whiteboard/osgi: build.xml
bundles/cocoon/build.xml bundles/cocoon_webapp/
bundles/cocoon_webapp/build.xml bundles/cocoon_webapp/src/ cocoon.sh
init.xargs
Author: danielf
Date: Sun Jun 26 14:42:28 2005
New Revision: 201911
URL: http://svn.apache.org/viewcvs?rev=201911&view=rev
Log:
Added start script, got the test cases to work, (except for one that require directory access to the block which the bundle protocol does not provide). Added block with sample webapp.
Added:
cocoon/whiteboard/osgi/bundles/cocoon_webapp/
cocoon/whiteboard/osgi/bundles/cocoon_webapp/build.xml (with props)
cocoon/whiteboard/osgi/bundles/cocoon_webapp/src/
cocoon/whiteboard/osgi/cocoon.sh
Modified:
cocoon/whiteboard/osgi/build.xml
cocoon/whiteboard/osgi/bundles/cocoon/build.xml
cocoon/whiteboard/osgi/init.xargs
Modified: cocoon/whiteboard/osgi/build.xml
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/osgi/build.xml?rev=201911&r1=201910&r2=201911&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/build.xml (original)
+++ cocoon/whiteboard/osgi/build.xml Sun Jun 26 14:42:28 2005
@@ -6,12 +6,14 @@
<ant dir="bundles/test" target="all"/>
<ant dir="bundles/cocoon" target="all"/>
<ant dir="bundles/cocoon_testcase" target="all"/>
+ <ant dir="bundles/cocoon_webapp" target="all"/>
</target>
<target name="clean">
<ant dir="bundles/test" target="clean"/>
<ant dir="bundles/cocoon" target="clean"/>
<ant dir="bundles/cocoon_testcase" target="clean"/>
+ <ant dir="bundles/cocoon_webapp" target="clean"/>
</target>
</project>
Modified: cocoon/whiteboard/osgi/bundles/cocoon/build.xml
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/osgi/bundles/cocoon/build.xml?rev=201911&r1=201910&r2=201911&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/bundles/cocoon/build.xml (original)
+++ cocoon/whiteboard/osgi/bundles/cocoon/build.xml Sun Jun 26 14:42:28 2005
@@ -33,7 +33,7 @@
<mapper type="flatten"/>
</pathconvert>
- <property name="export.package" value="org.apache.avalon.framework.context,org.apache.avalon.framework.logger,org.apache.avalon.framework.service,org.apache.cocoon,org.apache.cocoon.components.blocks,org.apache.cocoon.components.fam,org.apache.cocoon.components.modules.input,org.apache.cocoon.components.pipeline.impl,org.apache.cocoon.components.source.impl,org.apache.cocoon.components.treeprocessor,org.apache.cocoon.core,org.apache.cocoon.core.container,org.apache.cocoon.environment,org.apache.cocoon.environment.impl,org.apache.cocoon.generation,org.apache.cocoon.matching,org.apache.cocoon.reading,org.apache.cocoon.serialization,org.apache.cocoon.components.source,org.apache.cocoon.transformation,org.apache.cocoon.util,org.apache.cocoon.util.log,org.apache.avalon.excalibur.logger,org.apache.excalibur.source,org.apache.excalibur.source.impl,org.apache.excalibur.xml.impl,org.apache.excalibur.xmlizer,org.apache.log"/>
+ <property name="export.package" value="org.apache.avalon.framework.context,org.apache.avalon.framework.logger,org.apache.avalon.framework.service,org.apache.cocoon,org.apache.cocoon.components.blocks,org.apache.cocoon.components.classloader,org.apache.cocoon.components.fam,org.apache.cocoon.components.modules.input,org.apache.cocoon.components.pipeline.impl,org.apache.cocoon.components.source.impl,org.apache.cocoon.components.treeprocessor,org.apache.cocoon.components.treeprocessor.sitemap,org.apache.cocoon.core,org.apache.cocoon.core.container,org.apache.cocoon.environment,org.apache.cocoon.environment.impl,org.apache.cocoon.generation,org.apache.cocoon.matching,org.apache.cocoon.reading,org.apache.cocoon.serialization,org.apache.cocoon.components.source,org.apache.cocoon.transformation,org.apache.cocoon.util,org.apache.cocoon.util.log,org.apache.avalon.excalibur.logger,org.apache.excalibur.source,org.apache.excalibur.source.impl,org.apache.excalibur.xml.impl,org.apache.excalibur.xml.xslt,org.apache.excalibur.xmlizer,org.apache.log"/>
<property name = "bundle.build.lib" value = "false"/>
<property name = "bundle.build.api" value = "false"/>
Added: cocoon/whiteboard/osgi/bundles/cocoon_webapp/build.xml
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/osgi/bundles/cocoon_webapp/build.xml?rev=201911&view=auto
==============================================================================
--- cocoon/whiteboard/osgi/bundles/cocoon_webapp/build.xml (added)
+++ cocoon/whiteboard/osgi/bundles/cocoon_webapp/build.xml Sun Jun 26 14:42:28 2005
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE project [
+ <!ENTITY bundlebuild_include SYSTEM "../../ant/bundlebuild_include.xml">
+]>
+
+<project name="cocoon_webapp" default="all">
+
+ <property name="cocoon.trunk" location="../../../trunk"/>
+ <property name="cocoon.webapp" location="${cocoon.trunk}/build/webapp"/>
+
+ <property name="topdir" location="../.."/>
+
+ <property name="bundle.activator" value=""/>
+ <property name="bundle.description" value="Cocoon webapp"/>
+ <property name="bundle.vendor" value="Apache"/>
+ <property name="bundle.category" value="sitemap"/>
+ <property name="bundle.version" value="1.0.0"/>
+
+ <property name="impl.pattern" value="**"/>
+
+ <property name="do.bundle.custom.pre" value="true"/>
+
+ <target name="bundle.custom.pre" depends="copy.webapp"/>
+
+ <target name="copy.webapp">
+ <mkdir dir="resources"/>
+ <copy todir="resources">
+ <fileset dir="${cocoon.webapp}">
+ <exclude name="WEB-INF/lib/**"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <property name="do.bundle.custom.post" value="true"/>
+
+ <target name="bundle.custom.post" depends="delete.webapp">
+ </target>
+
+ <target name="delete.webapp">
+ <delete dir="resources"/>
+ </target>
+
+ &bundlebuild_include;
+
+</project>
Propchange: cocoon/whiteboard/osgi/bundles/cocoon_webapp/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: cocoon/whiteboard/osgi/cocoon.sh
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/osgi/cocoon.sh?rev=201911&view=auto
==============================================================================
--- cocoon/whiteboard/osgi/cocoon.sh (added)
+++ cocoon/whiteboard/osgi/cocoon.sh Sun Jun 26 14:42:28 2005
@@ -0,0 +1,58 @@
+#!/bin/sh
+# Copyright 1999-2004 The Apache Software Foundation
+#
+# Licensed 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.
+#
+# -----------------------------------------------------------------------------
+# Cocoon Unix Shell Script
+#
+# $Id$
+# -----------------------------------------------------------------------------
+
+# Configuration variables
+#
+# COCOON_HOME
+# The root of the Cocoon distribution
+#
+# JAVA_HOME
+# Home of Java installation.
+
+# ----- Verify and Set Required Environment Variables -------------------------
+
+if [ "$JAVA_HOME" = "" ] ; then
+ echo You must set JAVA_HOME to point at your Java Development Kit installation
+ exit 1
+fi
+
+if [ "$COCOON_HOME" = "" ] ; then
+ COCOON_HOME='../trunk'
+fi
+
+# ----- Set platform specific variables
+
+PATHSEP=":";
+case "`uname`" in
+ CYGWIN*) PATHSEP=";" ;;
+esac
+
+# ----- Set Local Variables ( used to minimize cut/paste) ---------------------
+
+JAVA="$JAVA_HOME/bin/java"
+ENDORSED_LIBS="$COCOON_HOME/lib/endorsed"
+ENDORSED="-Djava.endorsed.dirs=$ENDORSED_LIBS"
+
+# ----- Do the action ----------------------------------------------------------
+
+$JAVA $ENDORSED -jar framework.jar
+
+exit 0
Modified: cocoon/whiteboard/osgi/init.xargs
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/osgi/init.xargs?rev=201911&r1=201910&r2=201911&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/init.xargs (original)
+++ cocoon/whiteboard/osgi/init.xargs Sun Jun 26 14:42:28 2005
@@ -1,37 +1,59 @@
# Minimal start command file
--Dorg.knopflerfish.verbosity=0
--Dorg.knopflerfish.gosg.jars=file:jars/
--Dorg.knopflerfish.framework.debug.packages=false
--Dorg.knopflerfish.framework.debug.errors=true
--Dorg.knopflerfish.framework.debug.classloader=false
--Dorg.knopflerfish.framework.system.export.all_13=false
-
-# Flag for publicly exporting the bundle: special URL handler, might be a security risk
--Dorg.knopflerfish.osgi.registerbundleurlhandler=true
-
--Dorg.osgi.framework.system.packages=
+# load common properties
+-xargs props.xargs
--Dorg.knopflerfish.startlevel.use=true
+# Prefix for searching for bundle URLs from console or command line
+-Dorg.knopflerfish.gosg.jars=file:jars/
-init
# A minimal set of bundles to get the framework running and a tty console to interact with it
--install http://www.knopflerfish.org/releases/1.3.3/jars/log/log_api-1.0.0.jar
--install http://www.knopflerfish.org/releases/1.3.3/jars/console/console_api-1.0.0.jar
--istart http://www.knopflerfish.org/releases/1.3.3/jars/cm/cm_api-1.0.0.jar
--istart http://www.knopflerfish.org/releases/1.3.3/jars/log/log-1.0.0.jar
--istart http://www.knopflerfish.org/releases/1.3.3/jars/console/console-1.0.0.jar
--istart http://www.knopflerfish.org/releases/1.3.3/jars/consoletty/consoletty-1.0.0.jar
--istart http://www.knopflerfish.org/releases/1.3.3/jars/frameworkcommands/frameworkcommands-1.0.0.jar
--istart http://www.knopflerfish.org/releases/1.3.3/jars/logcommands/logcommands-1.0.0.jar
--istart http://www.knopflerfish.org/releases/1.3.3/jars/useradmin/useradmin_api-1.0.0.jar
+
+## Basic KF bundles
+-initlevel 1
+-install http://www.knopflerfish.org/releases/1.3.3/jars/log/log_all-1.0.0.jar
+-install http://www.knopflerfish.org/releases/1.3.3/jars/cm/cm_api-1.0.0.jar
+-install http://www.knopflerfish.org/releases/1.3.3/jars/console/console_all-1.0.0.jar
+
+## Some library bundles
+-initlevel 2
+-install http://www.knopflerfish.org/releases/1.3.3/jars/jsdk/jsdk-2.2.jar
+
+## HTTP Service
+-initlevel 4
+-install http://www.knopflerfish.org/releases/1.3.3/jars/http/http_all-1.1.0.jar
+
+## console command bundles
+-initlevel 5
+-install http://www.knopflerfish.org/releases/1.3.3/jars/frameworkcommands/frameworkcommands-1.0.0.jar
+-install http://www.knopflerfish.org/releases/1.3.3/jars/logcommands/logcommands-1.0.0.jar
+-install http://www.knopflerfish.org/releases/1.3.3/jars/consoletty/consoletty-1.0.0.jar
# JUnit
--istart ../jars-external/junit/junit_all-1.0.0.jar
+-install ../jars-external/junit/junit_all-1.0.0.jar
+
+-initlevel 8
+-install cocoon/cocoon_all-1.0.0.jar
-# Cocoon test (start and install them manually instead)
-#-install cocoon/cocoon_all-1.0.0.jar
-#-istart cocoon_testcase/cocoon_testcase-1.0.0.jar
+-initlevel 9
+-install cocoon_testcase/cocoon_testcase-1.0.0.jar
+
+-startlevel 9
-launch
+
+# Start of these bundles are delayed since thise makes start
+# order dependencies much easier
+
+-start http://www.knopflerfish.org/releases/1.3.3/jars/log/log_all-1.0.0.jar
+-start http://www.knopflerfish.org/releases/1.3.3/jars/cm/cm_api-1.0.0.jar
+-start http://www.knopflerfish.org/releases/1.3.3/jars/console/console_all-1.0.0.jar
+-start http://www.knopflerfish.org/releases/1.3.3/jars/consoletty/consoletty-1.0.0.jar
+-start http://www.knopflerfish.org/releases/1.3.3/jars/frameworkcommands/frameworkcommands-1.0.0.jar
+-start http://www.knopflerfish.org/releases/1.3.3/jars/logcommands/logcommands-1.0.0.jar
+-start http://www.knopflerfish.org/releases/1.3.3/jars/http/http_all-1.1.0.jar
+-start ../jars-external/junit/junit_all-1.0.0.jar
+-start cocoon_testcase/cocoon_testcase-1.0.0.jar
+
+