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 2006/04/18 00:30:09 UTC
svn commit: r394794 - in /cocoon/trunk/core/cocoon-webapp: ./ META-INF/
META-INF/MANIFEST.MF META-INF/components.xml META-INF/xconf/
META-INF/xconf/webapp.xconf
Author: danielf
Date: Mon Apr 17 15:30:06 2006
New Revision: 394794
URL: http://svn.apache.org/viewcvs?rev=394794&view=rev
Log:
Trying to make the examples in webapp work while getting all components from the core block. Doesn't work yet.
Added:
cocoon/trunk/core/cocoon-webapp/META-INF/
cocoon/trunk/core/cocoon-webapp/META-INF/MANIFEST.MF (with props)
cocoon/trunk/core/cocoon-webapp/META-INF/components.xml (with props)
cocoon/trunk/core/cocoon-webapp/META-INF/xconf/
cocoon/trunk/core/cocoon-webapp/META-INF/xconf/webapp.xconf (with props)
Modified:
cocoon/trunk/core/cocoon-webapp/ (props changed)
Propchange: cocoon/trunk/core/cocoon-webapp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Apr 17 15:30:06 2006
@@ -1,3 +1,4 @@
+
target
.classpath
.project
@@ -7,3 +8,6 @@
.classpath
.project
.wtpmodules
+build.properties
+.runtime
+.settings
Added: cocoon/trunk/core/cocoon-webapp/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-webapp/META-INF/MANIFEST.MF?rev=394794&view=auto
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/META-INF/MANIFEST.MF (added)
+++ cocoon/trunk/core/cocoon-webapp/META-INF/MANIFEST.MF Mon Apr 17 15:30:06 2006
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: cocoon_webapp
+Bundle-SymbolicName: cocoon_webapp
+Bundle-Version: 1.0.0
+Bundle-Localization: plugin
+Service-Component: META-INF/components.xml
+Import-Package:
+ javax.servlet,
+ org.apache.cocoon,
+ org.apache.cocoon.servlet,
+ org.apache.excalibur.source,
+ org.osgi.framework
+DynamicImport-Package: org.apache.cocoon.*
Propchange: cocoon/trunk/core/cocoon-webapp/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/core/cocoon-webapp/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
svn:keywords = Id
Added: cocoon/trunk/core/cocoon-webapp/META-INF/components.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-webapp/META-INF/components.xml?rev=394794&view=auto
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/META-INF/components.xml (added)
+++ cocoon/trunk/core/cocoon-webapp/META-INF/components.xml Mon Apr 17 15:30:06 2006
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 1999-2006 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$ -->
+<components xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
+
+ <!-- A parent BeanFactory that provides services from other bundles as beans -->
+ <scr:component name="org.apache.cocoon.webapp.SpringBridge">
+ <scr:implementation class="org.apache.cocoon.core.osgi.OSGiSpringBridge"/>
+ <scr:service>
+ <scr:provide interface="org.apache.cocoon.core.osgi.CocoonSpringBeanRegistry"/>
+ </scr:service>
+ </scr:component>
+
+ <!-- A BeanFactory that manages the beans of this bundle and provide them as services -->
+ <scr:component name="org.apache.cocoon.webapp.SpringEcmFactory">
+ <scr:implementation class="org.apache.cocoon.core.osgi.OSGiSpringECMFactory"/>
+ <scr:property name="configFile" value="/META-INF/xconf/webapp.xconf"/>
+ <scr:service>
+ <scr:provide interface="org.apache.cocoon.core.osgi.CocoonSpringBeanRegistry"/>
+ </scr:service>
+ <scr:reference name="parent"
+ interface="org.apache.cocoon.core.osgi.CocoonSpringBeanRegistry"
+ target="(component.name=org.apache.cocoon.webapp.SpringBridge)"
+ bind="setParentBeanFactory"/>
+ </scr:component>
+
+ <!-- The SitemapServlet of this bundle -->
+ <scr:component name="org.apache.cocoon.webapp.SitemapServlet">
+ <scr:implementation class="org.apache.cocoon.sitemap.SitemapServlet"/>
+ <scr:service>
+ <scr:provide interface="javax.servlet.Servlet"/>
+ </scr:service>
+ <scr:property name="path" value="/cocoon-webapp"/>
+ <scr:property name="sitemapPath" value="/src/main/webapp/sitemap.xmap"/>
+ <scr:reference name="beanFactory"
+ interface="org.apache.cocoon.core.osgi.CocoonSpringBeanRegistry"
+ target="(component.name=org.apache.cocoon.webapp.SpringEcmFactory)"
+ bind="setBeanFactory"/>
+ </scr:component>
+
+</components>
\ No newline at end of file
Propchange: cocoon/trunk/core/cocoon-webapp/META-INF/components.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/core/cocoon-webapp/META-INF/components.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: cocoon/trunk/core/cocoon-webapp/META-INF/xconf/webapp.xconf
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-webapp/META-INF/xconf/webapp.xconf?rev=394794&view=auto
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/META-INF/xconf/webapp.xconf (added)
+++ cocoon/trunk/core/cocoon-webapp/META-INF/xconf/webapp.xconf Mon Apr 17 15:30:06 2006
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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$ -->
+<components>
+
+ <!-- A bundle local source resolver is needed for geting the context path right -->
+ <component role="org.apache.excalibur.source.SourceResolver"
+ class="org.apache.cocoon.components.source.CocoonSourceResolver"/>
+
+</components>
Propchange: cocoon/trunk/core/cocoon-webapp/META-INF/xconf/webapp.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/core/cocoon-webapp/META-INF/xconf/webapp.xconf
------------------------------------------------------------------------------
svn:keywords = Id