You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2005/07/18 17:18:57 UTC
svn commit: r219510 - in /cocoon/trunk: ./ legal/ lib/osgi/
lib/osgi/knopflerfish/ src/osgi-servlet/ src/osgi-servlet/org/
src/osgi-servlet/org/apache/ src/osgi-servlet/org/apache/cocoon/
src/osgi-servlet/org/apache/cocoon/service/ src/osgi-servlet/org...
Author: reinhard
Date: Mon Jul 18 08:17:24 2005
New Revision: 219510
URL: http://svn.apache.org/viewcvs?rev=219510&view=rev
Log:
move osgi stuff to trunk
Added:
cocoon/trunk/init.xargs
cocoon/trunk/legal/knopflerfish-cm_api-1.0.0.jar.license.txt
cocoon/trunk/legal/knopflerfish-console_all-1.0.0.jar.license.txt
cocoon/trunk/legal/knopflerfish-consoletty-1.0.0.jar.license.txt
cocoon/trunk/legal/knopflerfish-framework-1.3.3.jar.txt
cocoon/trunk/legal/knopflerfish-frameworkcommands-1.0.0.jar.license.txt
cocoon/trunk/legal/knopflerfish-http_all-1.1.0.jar.license.txt
cocoon/trunk/legal/knopflerfish-log_all-1.0.0.jar.license.txt
cocoon/trunk/legal/knopflerfish-logcommands-1.0.0.jar.license.txt
cocoon/trunk/legal/knopflerfish.license.txt
cocoon/trunk/legal/osgi_copyright.txt
cocoon/trunk/lib/osgi/
cocoon/trunk/lib/osgi/knopflerfish/
cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-cm_api-1.0.0.jar (with props)
cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-console_all-1.0.0.jar (with props)
cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-consoletty-1.0.0.jar (with props)
cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-framework-1.3.3.jar (with props)
cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-frameworkcommands-1.0.0.jar (with props)
cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-http_all-1.1.0.jar (with props)
cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-log_all-1.0.0.jar (with props)
cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-logcommands-1.0.0.jar (with props)
cocoon/trunk/props.xargs
cocoon/trunk/restart.xargs
cocoon/trunk/src/osgi-servlet/
cocoon/trunk/src/osgi-servlet/Manifest.mf
cocoon/trunk/src/osgi-servlet/org/
cocoon/trunk/src/osgi-servlet/org/apache/
cocoon/trunk/src/osgi-servlet/org/apache/cocoon/
cocoon/trunk/src/osgi-servlet/org/apache/cocoon/service/
cocoon/trunk/src/osgi-servlet/org/apache/cocoon/service/servlet/
cocoon/trunk/src/osgi-servlet/org/apache/cocoon/service/servlet/impl/
cocoon/trunk/src/osgi-servlet/org/apache/cocoon/service/servlet/impl/Activator.java
cocoon/trunk/tools/targets/osgi-build.xml
Added: cocoon/trunk/init.xargs
URL: http://svn.apache.org/viewcvs/cocoon/trunk/init.xargs?rev=219510&view=auto
==============================================================================
--- cocoon/trunk/init.xargs (added)
+++ cocoon/trunk/init.xargs Mon Jul 18 08:17:24 2005
@@ -0,0 +1,53 @@
+# Minimal start command file
+
+# load common properties
+-xargs props.xargs
+
+# Prefix for searching for bundle URLs from console or command line
+-Dorg.knopflerfish.gosg.jars=file:.
+
+-init
+
+# A minimal set of bundles to get the framework running and a tty console to interact with it
+
+## Basic KF bundles
+-initlevel 1
+-install lib/osgi/knopflerfish/knopflerfish-log_all-1.0.0.jar
+-install lib/osgi/knopflerfish/knopflerfish-cm_api-1.0.0.jar
+-install lib/osgi/knopflerfish/knopflerfish-console_all-1.0.0.jar
+
+## Some library bundles
+-initlevel 2
+-install build/osgi/org.apache.cocoon_1.0.0.jar
+
+## HTTP Service
+-initlevel 4
+-install lib/osgi/knopflerfish/knopflerfish-http_all-1.1.0.jar
+
+## console command bundles
+-initlevel 5
+-install lib/osgi/knopflerfish/knopflerfish-frameworkcommands-1.0.0.jar
+-install lib/osgi/knopflerfish/knopflerfish-logcommands-1.0.0.jar
+-install lib/osgi/knopflerfish/knopflerfish-consoletty-1.0.0.jar
+
+-initlevel 7
+-install build/osgi/org.apache.cocoon_webapp_1.0.0.jar
+
+-initlevel 8
+-install build/osgi/org.apache.cocoon_servlet_1.0.0.jar
+
+-startlevel 9
+
+-launch
+
+# Start of these bundles are delayed since thise makes start
+# order dependencies much easier
+
+-start lib/osgi/knopflerfish/knopflerfish-log_all-1.0.0.jar
+-start lib/osgi/knopflerfish/knopflerfish-cm_api-1.0.0.jar
+-start lib/osgi/knopflerfish/knopflerfish-console_all-1.0.0.jar
+-start lib/osgi/knopflerfish/knopflerfish-consoletty-1.0.0.jar
+-start lib/osgi/knopflerfish/knopflerfish-frameworkcommands-1.0.0.jar
+-start lib/osgi/knopflerfish/knopflerfish-logcommands-1.0.0.jar
+-start lib/osgi/knopflerfish/knopflerfish-http_all-1.1.0.jar
+-start build/osgi/org.apache.cocoon_servlet_1.0.0.jar
Added: cocoon/trunk/legal/knopflerfish-cm_api-1.0.0.jar.license.txt
URL: http://svn.apache.org/viewcvs/cocoon/trunk/legal/knopflerfish-cm_api-1.0.0.jar.license.txt?rev=219510&view=auto
==============================================================================
--- cocoon/trunk/legal/knopflerfish-cm_api-1.0.0.jar.license.txt (added)
+++ cocoon/trunk/legal/knopflerfish-cm_api-1.0.0.jar.license.txt Mon Jul 18 08:17:24 2005
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2003-2004, KNOPFLERFISH project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * - Neither the name of the KNOPFLERFISH project nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
Added: cocoon/trunk/legal/knopflerfish-console_all-1.0.0.jar.license.txt
URL: http://svn.apache.org/viewcvs/cocoon/trunk/legal/knopflerfish-console_all-1.0.0.jar.license.txt?rev=219510&view=auto
==============================================================================
--- cocoon/trunk/legal/knopflerfish-console_all-1.0.0.jar.license.txt (added)
+++ cocoon/trunk/legal/knopflerfish-console_all-1.0.0.jar.license.txt Mon Jul 18 08:17:24 2005
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2003-2004, KNOPFLERFISH project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * - Neither the name of the KNOPFLERFISH project nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
Added: cocoon/trunk/legal/knopflerfish-consoletty-1.0.0.jar.license.txt
URL: http://svn.apache.org/viewcvs/cocoon/trunk/legal/knopflerfish-consoletty-1.0.0.jar.license.txt?rev=219510&view=auto
==============================================================================
--- cocoon/trunk/legal/knopflerfish-consoletty-1.0.0.jar.license.txt (added)
+++ cocoon/trunk/legal/knopflerfish-consoletty-1.0.0.jar.license.txt Mon Jul 18 08:17:24 2005
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2003-2004, KNOPFLERFISH project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * - Neither the name of the KNOPFLERFISH project nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
Added: cocoon/trunk/legal/knopflerfish-framework-1.3.3.jar.txt
URL: http://svn.apache.org/viewcvs/cocoon/trunk/legal/knopflerfish-framework-1.3.3.jar.txt?rev=219510&view=auto
==============================================================================
--- cocoon/trunk/legal/knopflerfish-framework-1.3.3.jar.txt (added)
+++ cocoon/trunk/legal/knopflerfish-framework-1.3.3.jar.txt Mon Jul 18 08:17:24 2005
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2003-2004, KNOPFLERFISH project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * - Neither the name of the KNOPFLERFISH project nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
Added: cocoon/trunk/legal/knopflerfish-frameworkcommands-1.0.0.jar.license.txt
URL: http://svn.apache.org/viewcvs/cocoon/trunk/legal/knopflerfish-frameworkcommands-1.0.0.jar.license.txt?rev=219510&view=auto
==============================================================================
--- cocoon/trunk/legal/knopflerfish-frameworkcommands-1.0.0.jar.license.txt (added)
+++ cocoon/trunk/legal/knopflerfish-frameworkcommands-1.0.0.jar.license.txt Mon Jul 18 08:17:24 2005
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2003-2004, KNOPFLERFISH project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * - Neither the name of the KNOPFLERFISH project nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
Added: cocoon/trunk/legal/knopflerfish-http_all-1.1.0.jar.license.txt
URL: http://svn.apache.org/viewcvs/cocoon/trunk/legal/knopflerfish-http_all-1.1.0.jar.license.txt?rev=219510&view=auto
==============================================================================
--- cocoon/trunk/legal/knopflerfish-http_all-1.1.0.jar.license.txt (added)
+++ cocoon/trunk/legal/knopflerfish-http_all-1.1.0.jar.license.txt Mon Jul 18 08:17:24 2005
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2003-2004, KNOPFLERFISH project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * - Neither the name of the KNOPFLERFISH project nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
Added: cocoon/trunk/legal/knopflerfish-log_all-1.0.0.jar.license.txt
URL: http://svn.apache.org/viewcvs/cocoon/trunk/legal/knopflerfish-log_all-1.0.0.jar.license.txt?rev=219510&view=auto
==============================================================================
--- cocoon/trunk/legal/knopflerfish-log_all-1.0.0.jar.license.txt (added)
+++ cocoon/trunk/legal/knopflerfish-log_all-1.0.0.jar.license.txt Mon Jul 18 08:17:24 2005
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2003-2004, KNOPFLERFISH project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * - Neither the name of the KNOPFLERFISH project nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
Added: cocoon/trunk/legal/knopflerfish-logcommands-1.0.0.jar.license.txt
URL: http://svn.apache.org/viewcvs/cocoon/trunk/legal/knopflerfish-logcommands-1.0.0.jar.license.txt?rev=219510&view=auto
==============================================================================
--- cocoon/trunk/legal/knopflerfish-logcommands-1.0.0.jar.license.txt (added)
+++ cocoon/trunk/legal/knopflerfish-logcommands-1.0.0.jar.license.txt Mon Jul 18 08:17:24 2005
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2003-2004, KNOPFLERFISH project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * - Neither the name of the KNOPFLERFISH project nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
Added: cocoon/trunk/legal/knopflerfish.license.txt
URL: http://svn.apache.org/viewcvs/cocoon/trunk/legal/knopflerfish.license.txt?rev=219510&view=auto
==============================================================================
--- cocoon/trunk/legal/knopflerfish.license.txt (added)
+++ cocoon/trunk/legal/knopflerfish.license.txt Mon Jul 18 08:17:24 2005
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2003-2004, KNOPFLERFISH project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * - Neither the name of the KNOPFLERFISH project nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
Added: cocoon/trunk/legal/osgi_copyright.txt
URL: http://svn.apache.org/viewcvs/cocoon/trunk/legal/osgi_copyright.txt?rev=219510&view=auto
==============================================================================
--- cocoon/trunk/legal/osgi_copyright.txt (added)
+++ cocoon/trunk/legal/osgi_copyright.txt Mon Jul 18 08:17:24 2005
@@ -0,0 +1,65 @@
+Copyright (c) 2000, 2003
+
+The Open Services Gateway Initiative
+Bishop Ranch 2
+2694 Bishop Drive
+Suite 275
+San Ramon
+CA 94583 USA
+
+All Rights Reserved.
+
+LEGAL TERMS AND CONDITIONS REGARDING SPECIFICATION
+
+Implementation of certain elements of the Open Services Gateway
+Initiative (OSGi) Specification may be subject to third party
+intellectual property rights, including without limitation, patent
+rights (such a third party may or may not be a member of OSGi). OSGi is
+not responsible and shall not be held responsible in any manner for
+identifying or failing to identify any or all such third party
+intellectual property rights.
+
+THE RECIPIENT ACKNOWLEDGES AND AGREES THAT THE SPECIFICATION IS PROVIDED
+"AS IS" AND WITH NO WARRANTIES WHATSOEVER, WHETHER EXPRESS, IMPLIED OR
+STATUTORY, INCLUDING, BUT NOT LIMITED TO ANY WARRANTY OF
+MERCHANTABILITY, NONINFRINGEMENT, FITNESS OF ANY PARTICULAR PURPOSE, OR
+ANY WARRANTY OTHERWISE ARISING OUT OF ANY PROPOSAL, SPECIFICATION, OR
+SAMPLE. THE RECIPIENT'S USE OF THE SPECIFICATION IS SOLELY AT THE
+RECIPIENT'S OWN RISK. THE RECIPIENT'S USE OF THE SPECIFICATION IS
+SUBJECT TO THE RECIPIENT'S OSGi MEMBER AGREEMENT, IN THE EVENT THAT THE
+RECIPIENT IS AN OSGi MEMBER. IN NO EVENT SHALL OSGi BE LIABLE OR
+OBLIGATED TO THE RECIPIENT OR ANY THIRD PARTY IN ANY MANNER FOR ANY
+SPECIAL, NON-COMPENSATORY, CONSEQUENTIAL, INDIRECT, INCIDENTAL,
+STATUTORY OR PUNITIVE DAMAGES OF ANY KIND, INCLUDING, WITHOUT
+LIMITATION, LOST PROFITS AND LOST REVENUE, REGARDLESS OF THE FORM OF
+ACTION, WHETHER IN CONTRACT, TORT, NEGLIGENCE, STRICT PRODUCT LIABILITY,
+OR OTHERWISE, EVEN IF OSGi HAS BEEN INFORMED OF OR IS AWARE OF THE
+POSSIBILITY OF ANY SUCH DAMAGES IN ADVANCE.
+
+THE LIMITATIONS SET FORTH ABOVE SHALL BE DEEMED TO APPLY TO THE MAXIMUM
+EXTENT PERMITTED BY APPLICABLE LAW AND NOTWITHSTANDING THE FAILURE OF
+THE ESSENTIAL PURPOSE OF ANY LIMITED REMEDIES AVAILABLE TO THE
+RECIPIENT. THE RECIPIENT ACKNOWLEDGES AND AGREES THAT THE RECIPIENT HAS
+FULLY CONSIDERED THE FOREGOING ALLOCATION OF RISK AND FINDS IT
+REASONABLE, AND THAT THE FOREGOING LIMITATIONS ARE AN ESSENTIAL BASIS OF
+THE BARGAIN BETWEEN THE RECIPIENT AND OSGi. IF THE RECIPIENT USES THE
+SPECIFICATION, THE RECIPIENT AGREES TO ALL OF THE FOREGOING TERMS AND
+CONDITIONS. IF THE RECIPIENT DOES NOT AGREE TO THESE TERMS AND
+CONDITIONS, THE RECIPIENT SHOULD NOT USE THE SPECIFICATION AND SHOULD
+CONTACT OSGi IMMEDIATELY.
+
+Trademarks
+
+OSGi(TM) is a trademark, registered trademark, or service mark of The
+Open Services Gateway Initiative in the US and other countries. Java is
+a trademark, registered trademark, or service mark of Sun Microsystems,
+Inc. in the US and other countries. All other trademarks, registered
+trademarks, or service marks used in this document are the property of
+their respective owners and are hereby recognized.
+
+Feedback
+
+This specification can be downloaded from the OSGi web site:
+http://www.osgi.org. Comments about this specification can be mailed
+to: speccomments@mail.osgi.org
+
Added: cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-cm_api-1.0.0.jar
URL: http://svn.apache.org/viewcvs/cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-cm_api-1.0.0.jar?rev=219510&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-cm_api-1.0.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-console_all-1.0.0.jar
URL: http://svn.apache.org/viewcvs/cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-console_all-1.0.0.jar?rev=219510&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-console_all-1.0.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-consoletty-1.0.0.jar
URL: http://svn.apache.org/viewcvs/cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-consoletty-1.0.0.jar?rev=219510&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-consoletty-1.0.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-framework-1.3.3.jar
URL: http://svn.apache.org/viewcvs/cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-framework-1.3.3.jar?rev=219510&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-framework-1.3.3.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-frameworkcommands-1.0.0.jar
URL: http://svn.apache.org/viewcvs/cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-frameworkcommands-1.0.0.jar?rev=219510&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-frameworkcommands-1.0.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-http_all-1.1.0.jar
URL: http://svn.apache.org/viewcvs/cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-http_all-1.1.0.jar?rev=219510&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-http_all-1.1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-log_all-1.0.0.jar
URL: http://svn.apache.org/viewcvs/cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-log_all-1.0.0.jar?rev=219510&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-log_all-1.0.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-logcommands-1.0.0.jar
URL: http://svn.apache.org/viewcvs/cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-logcommands-1.0.0.jar?rev=219510&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cocoon/trunk/lib/osgi/knopflerfish/knopflerfish-logcommands-1.0.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: cocoon/trunk/props.xargs
URL: http://svn.apache.org/viewcvs/cocoon/trunk/props.xargs?rev=219510&view=auto
==============================================================================
--- cocoon/trunk/props.xargs (added)
+++ cocoon/trunk/props.xargs Mon Jul 18 08:17:24 2005
@@ -0,0 +1,47 @@
+#
+# Properties used by both init.xargs and restart.xargs
+#
+
+# The Service Platform ID should be used by bundles needing to
+# a unique ID for the platform itself
+-Dorg.osgi.provisioning.spid=knopflerfish
+
+# Initial startup verbosity, 0 is low verbosity
+-Dorg.knopflerfish.verbosity=0
+
+
+# URL to bundle repository
+-Doscar.repository.url=http://www.knopflerfish.org/repo/repository.xml
+
+# Various debug flags
+-Dorg.knopflerfish.framework.debug.packages=false
+-Dorg.knopflerfish.framework.debug.errors=true
+-Dorg.knopflerfish.framework.debug.classloader=false
+-Dorg.knopflerfish.framework.debug.startlevel=false
+-Dorg.knopflerfish.framework.debug.ldap=false
+
+# Comma-separated list of packges exported by system classloader
+-Dorg.osgi.framework.system.packages=
+
+# Flag for publicly exporting the bundle: special URL handler, might be a security risk
+-Dorg.knopflerfish.osgi.registerbundleurlhandler=true
+
+# Web server properties
+-Dorg.knopflerfish.http.dnslookup=false
+-Dorg.osgi.service.http.port=8080
+
+-Dorg.knopflerfish.startlevel.use=true
+
+# Log service properties
+-Dorg.knopflerfish.log.out=false
+-Dorg.knopflerfish.log.level=info
+-Dorg.knopflerfish.log.grabio=true
+-Dorg.knopflerfish.log.file=true
+
+#consoletelnet properties
+-Dorg.knopflerfish.consoletelnet.user=admin
+-Dorg.knopflerfish.consoletelnet.pwd=admin
+-Dorg.knopflerfish.consoletelnet.port=23
+
+
+
Added: cocoon/trunk/restart.xargs
URL: http://svn.apache.org/viewcvs/cocoon/trunk/restart.xargs?rev=219510&view=auto
==============================================================================
--- cocoon/trunk/restart.xargs (added)
+++ cocoon/trunk/restart.xargs Mon Jul 18 08:17:24 2005
@@ -0,0 +1,4 @@
+# load common properties
+-xargs props.xargs
+
+-launch 0
Added: cocoon/trunk/src/osgi-servlet/Manifest.mf
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/osgi-servlet/Manifest.mf?rev=219510&view=auto
==============================================================================
--- cocoon/trunk/src/osgi-servlet/Manifest.mf (added)
+++ cocoon/trunk/src/osgi-servlet/Manifest.mf Mon Jul 18 08:17:24 2005
@@ -0,0 +1,20 @@
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.6.5
+Created-By: 1.4.2_08-b03 (Sun Microsystems Inc.)
+Bundle-Name: cocoon_servlet
+Bundle-SymbolicName: org.apache.cocoon:cocoon_servlet:1.0.0
+Bundle-Version: 1.0.0
+Bundle-Description: Cocoon servlet bundle
+Bundle-Vendor: Apache
+Bundle-DocURL: http://cocoon.apache.org
+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
+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
+Bundle-SubversionURL: https://svn.apache.org/repos/asf/cocoon/trunk/src/osgi-servlet/
+
Added: cocoon/trunk/src/osgi-servlet/org/apache/cocoon/service/servlet/impl/Activator.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/osgi-servlet/org/apache/cocoon/service/servlet/impl/Activator.java?rev=219510&view=auto
==============================================================================
--- cocoon/trunk/src/osgi-servlet/org/apache/cocoon/service/servlet/impl/Activator.java (added)
+++ cocoon/trunk/src/osgi-servlet/org/apache/cocoon/service/servlet/impl/Activator.java Mon Jul 18 08:17:24 2005
@@ -0,0 +1,179 @@
+/*
+ * Copyright 1999-2005 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.
+ */
+package org.apache.cocoon.service.servlet.impl;
+
+import java.util.Hashtable;
+import java.net.URL;
+import java.io.InputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.cocoon.servlet.CocoonServlet;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceEvent;
+import org.osgi.framework.ServiceListener;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.http.HttpContext;
+import org.osgi.service.http.HttpService;
+import org.osgi.service.log.LogService;
+import org.osgi.util.tracker.ServiceTracker;
+
+/**
+ * Activator which register a Cocoon servlet
+ */
+
+public class Activator implements BundleActivator {
+
+ static BundleContext bc;
+ static ServiceTracker logTracker;
+ static final String SERVLET_ALIAS = "/"; // the http server root
+ static final String SITEMAP = "sitemap";
+
+ private Hashtable registrations = new Hashtable();
+ private Bundle sitemapBundle;
+
+ public void start(BundleContext bc) throws BundleException {
+
+ this.bc = bc;
+ this.logTracker = new ServiceTracker(bc, LogService.class.getName(), null);
+ this.logTracker.open();
+
+ // FIXME: Add a BundleListener to detect if a sitemap bundle
+ // is installed, updated or uninstalled.
+ this.sitemapBundle = getSitemapBundle();
+ ((LogService)this.logTracker.getService()).log(LogService.LOG_INFO, "set sitemap bundle " + this.sitemapBundle);
+
+ ServiceListener listener = new ServiceListener() {
+ public void serviceChanged(ServiceEvent ev) {
+ ServiceReference sr = ev.getServiceReference();
+
+ switch(ev.getType()) {
+ case ServiceEvent.REGISTERED:
+ setRoot(sr);
+ break;
+ case ServiceEvent.UNREGISTERING:
+ unsetRoot(sr);
+ break;
+ }
+ }
+ };
+
+ String filter = "(objectclass=" + HttpService.class.getName() + ")";
+
+ try {
+ bc.addServiceListener(listener, filter);
+
+ ServiceReference[] srl = bc.getServiceReferences(null, filter);
+ for(int i = 0; srl != null && i < srl.length; i++) {
+ listener.serviceChanged(new ServiceEvent(ServiceEvent.REGISTERED,
+ srl[i]));
+ }
+ } catch (Exception e) {
+ ((LogService)this.logTracker.getService()).log(LogService.LOG_ERROR,
+ "Failed to set up listener for http service", e);
+ }
+ }
+
+ public void stop(BundleContext bc) throws BundleException {
+ }
+
+ private Bundle getSitemapBundle() {
+ Bundle[] bundles = this.bc.getBundles();
+ for (int i = 0; i < bundles.length; i++) {
+ Bundle bundle = bundles[i];
+ try {
+ ((LogService)this.logTracker.getService()).log(LogService.LOG_INFO, "checking bundle " + bundle + " name=" + bundle.getHeaders().get(Constants.BUNDLE_NAME) + " category=" + bundle.getHeaders().get(Constants.BUNDLE_CATEGORY) + " state=" + bundle.getState());
+ if ((bundle.getState() == Bundle.INSTALLED ||
+ bundle.getState() == Bundle.RESOLVED ||
+ bundle.getState() == Bundle.ACTIVE)) {
+ ((LogService)this.logTracker.getService()).log(LogService.LOG_INFO, "ok state");
+ if (SITEMAP.equals(bundle.getHeaders().get(Constants.BUNDLE_CATEGORY))) {
+ ((LogService)this.logTracker.getService()).log(LogService.LOG_INFO, "sitemap");
+ return bundle;
+ }
+ }
+ } catch (NullPointerException e) {
+ // BUNDLE_CATEGORY not present in the headers of the
+ // bundle, nothing to do.
+ }
+ }
+ return null;
+ }
+
+ private void setRoot(ServiceReference sr) {
+
+ if(registrations.containsKey(sr)) {
+ return; // already done
+ }
+
+ ((LogService)this.logTracker.getService()).log(LogService.LOG_INFO, "set root for " + sr);
+
+ HttpService http = (HttpService)bc.getService(sr);
+
+ HttpContext context = new HttpContext() {
+ public boolean handleSecurity(HttpServletRequest request,
+ HttpServletResponse response)
+ throws java.io.IOException {
+ return true;
+ }
+
+ public URL getResource(String name) {
+ if (sitemapBundle != null) {
+ return sitemapBundle.getResource(name);
+ } else {
+ return null;
+ }
+ }
+
+ public String getMimeType(String reqEntry) {
+ return null; // server decides type
+ }
+ };
+
+ try {
+ Hashtable parameters = new Hashtable();
+ parameters.put("init-classloader", "true");
+ parameters.put("work-directory", "work");
+ http.registerServlet(SERVLET_ALIAS, new CocoonServlet(), parameters, context);
+
+ registrations.put(sr, context);
+ } catch (Exception e) {
+ ((LogService)this.logTracker.getService()).log(LogService.LOG_ERROR,
+ "Failed to register resource", e);
+ }
+ }
+
+ private void unsetRoot(ServiceReference sr) {
+ if(!registrations.containsKey(sr)) {
+ return; // nothing to do
+ }
+
+ ((LogService)this.logTracker.getService()).log(LogService.LOG_INFO, "unset root for " + sr);
+
+ HttpService http = (HttpService)bc.getService(sr);
+
+ if(http != null) {
+ http.unregister(SERVLET_ALIAS);
+ bc.ungetService(sr);
+ }
+ registrations.remove(sr);
+ }
+
+}
Added: cocoon/trunk/tools/targets/osgi-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/osgi-build.xml?rev=219510&view=auto
==============================================================================
--- cocoon/trunk/tools/targets/osgi-build.xml (added)
+++ cocoon/trunk/tools/targets/osgi-build.xml Mon Jul 18 08:17:24 2005
@@ -0,0 +1,143 @@
+<?xml version="1.0"?>
+<!--
+ Copyright 1999-2005 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.
+-->
+<!-- $Id: compile-build.xml 193143 2005-06-23 14:18:06Z danielf $ -->
+<project name="osgi">
+
+ <description>OSGi Targets</description>
+
+ <target name="osgi.init">
+ <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.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="lib.osgi" value="${lib}/osgi"/>
+
+ <property name="src.osgi.servlet" value="${src}/osgi-servlet"/>
+
+ <mkdir dir="${build.osgi}"/>
+ <mkdir dir="${build.osgi.servlet}"/>
+ <mkdir dir="${build.osgi.webapp}"/>
+ </target>
+
+ <target name="osgi" depends="osgi.init, compile-core, osgi.compile-osgi-servlet, osgi.prepare-webapp, osgi.bundling"
+ description="Setup Cocoon to run within OSGi containers">
+ </target>
+
+ <target name="osgi.clean" depends="osgi.init">
+ <delete dir="${build.osgi}"/>
+ </target>
+
+ <target name="osgi.compile-osgi-servlet">
+ <path id="osgi.osgi-servlet.classpath">
+ <fileset dir="./lib/osgi">
+ <include name="*/*.jar"/>
+ </fileset>
+ <!-- include Cocoon core -->
+ <dirset dir="${build.dest}"/>
+ <pathelement location="${lib.core}/servlet-2_3.jar"/>
+ </path>
+
+ <mkdir dir="${build.osgi.servlet}"/>
+ <javac
+ debug="${compiler.debug}"
+ optimize="${compiler.optimize}"
+ deprecation="${compiler.deprecation}"
+ target="${target.vm}"
+ source="${source.vm}"
+ nowarn="${compiler.nowarn}"
+ compiler="${compiler}"
+ srcdir="${src.osgi.servlet}"
+ destdir="${build.osgi.servlet}"
+ classpathref="osgi.osgi-servlet.classpath"/>
+ </target>
+
+ <target name="osgi.prepare-webapp">
+ <copy file="${webapp}/welcome.xml" tofile="${build.osgi.webapp}/welcome.xml" filtering="on"/>
+ <copy file="${webapp}/not-found.xml" tofile="${build.osgi.webapp}/not-found.xml" filtering="on"/>
+ <copy file="${webapp}/welcome.xslt" tofile="${build.osgi.webapp}/welcome.xslt" filtering="on"/>
+ <copy file="${webapp}/sitemap.xmap" tofile="${build.osgi.webapp}/sitemap.xmap"/>
+ <copy file="${webapp}/sitemap-additions.xconf" tofile="${build.osgi.webapp}/sitemap-additions.xconf"/>
+ <copy file="${webapp}/wiring.xml" tofile="${build.osgi.webapp}/wiring.xml" filtering="on"/>
+
+ <copy todir="${build.osgi.webapp}/stylesheets" filtering="on">
+ <fileset dir="${webapp}/stylesheets">
+ <include name="**/*.xslt"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${build.osgi.webapp}/resources" filtering="off">
+ <fileset dir="${webapp}/resources"/>
+ </copy>
+
+ <copy todir="${build.osgi.webapp}/samples" filtering="off">
+ <fileset dir="${webapp}/samples"/>
+ </copy>
+
+ <copy todir="${build.osgi.webapp}/WEB-INF" filtering="on">
+ <fileset dir="${webapp}/WEB-INF">
+ <exclude name="compile/**"/>
+ </fileset>
+ </copy>
+
+ <replace file="${build.osgi.webapp}/WEB-INF/cocoon.xconf">
+ <replacetoken><![CDATA[<include dir="context://WEB-INF/xconf" pattern="*.xconf"/>]]></replacetoken>
+ <replacevalue><![CDATA[<!-- replaced by the OSGi Ant task
+ include dir="context://WEB-INF/xconf" pattern="*.xconf"/-->
+
+ <include src="context://WEB-INF/xconf/cocoon-blocks.xconf"/>]]>
+ </replacevalue>
+ </replace>
+
+ <replace file="${build.osgi.webapp}/WEB-INF/cocoon.xconf">
+ <replacetoken><![CDATA[<include dir="context://WEB-INF/xconf" pattern="*.samplesxconf"/>]]></replacetoken>
+ <replacevalue><![CDATA[<!-- excluded by the OSGi Ant task!!!!
+ include dir="context://WEB-INF/xconf" pattern="*.samplesxconf"/-->]]></replacevalue>
+ </replace>
+
+ <replace file="${build.osgi.webapp}/WEB-INF/logkit.xconf">
+ <replacetoken><![CDATA[<include dir="context://WEB-INF/xconf" pattern="*.logkit"/>]]></replacetoken>
+ <replacevalue><![CDATA[<!-- excluded by the OSGi Ant task!!!!
+ include dir="context://WEB-INF/xconf" pattern="*.logkit"/-->]]></replacevalue>
+ </replace>
+
+ </target>
+
+ <target name="osgi.bundling">
+ <jar file="${build.osgi}/${build.osgi.bundles.cocoon}" manifest="${build.dest}/Manifest.mf">
+ <fileset dir="${build.dest}/">
+ <exclude name="Manifest.mf"/>
+ <include name="**"/>
+ </fileset>
+ <fileset dir="${lib.core}">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${lib.endorsed}">
+ <include name="*.jar"/>
+ </fileset>
+ </jar>
+ <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">
+ <fileset dir="${build.osgi.servlet}"/>
+ </jar>
+ </target>
+
+</project>