cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dani...@apache.org
Subject svn commit: r575942 - in /cocoon/whiteboard/osgi/core: cocoon-core-osgi/src/main/resources/META-INF/spring/ cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/ cocoon-xml/cocoon-xml-resolver-osgi/ cocoon-...
Date Sat, 15 Sep 2007 17:16:14 GMT
Author: danielf
Date: Sat Sep 15 10:16:13 2007
New Revision: 575942

URL: http://svn.apache.org/viewvc?rev=575942&view=rev
Log:
* Continued work on the beans of the core. Now all the beans are created, next step will be
to publish them in the OSGi context.
* Corrected bug in xml-resolver definition.
* Creating the object model in cocoon-expression-language-impl-osgi.

Added:
    cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/AbstractStringTemplateParser.xml
  (with props)
    cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/core.xml
  (with props)
    cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/sitemap-impl.xml
  (with props)
    cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/ObjectModel.xml
  (with props)
    cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/object-model.xml
  (with props)
Modified:
    cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/core.xconf
    cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-impl.xml
    cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/object-model-providers.xml
    cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-resolver-osgi/pom.xml
    cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-resolver-osgi/src/main/resources/META-INF/spring/xml-resolver.xml

Added: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/AbstractStringTemplateParser.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/AbstractStringTemplateParser.xml?rev=575942&view=auto
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/AbstractStringTemplateParser.xml
(added)
+++ cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/AbstractStringTemplateParser.xml
Sat Sep 15 10:16:13 2007
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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.
+-->
+<!-- SVN $Id$ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+  
+  <bean id="org.apache.cocoon.template.expression.AbstractStringTemplateParser" 
+        class="org.apache.cocoon.template.expression.AbstractStringTemplateParser" abstract="true">
+    <property name="expressionFactory" ref="org.apache.cocoon.el.ExpressionFactory"/>
+  </bean>
+  
+</beans>

Propchange: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/AbstractStringTemplateParser.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/AbstractStringTemplateParser.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/core.xconf
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/core.xconf?rev=575942&r1=575941&r2=575942&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/core.xconf
(original)
+++ cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/core.xconf
Sat Sep 15 10:16:13 2007
@@ -29,10 +29,30 @@
       | Include all Avalon configuration files from cocoon-pipeline-components
       +-->
   <include src="/META-INF/cocoon/avalon/cocoon-core-xpath-processor.xconf"/>
-  <!--
   <include src="/META-INF/cocoon/avalon/cocoon-core-xslt-processor.xconf"/>
   <include src="/META-INF/cocoon/avalon/cocoon-core-xslt-saxon.xconf"/>
   <include src="/META-INF/cocoon/avalon/cocoon-core-xslt-xalan.xconf"/>
   <include src="/META-INF/cocoon/avalon/cocoon-core-xslt-xsltc.xconf"/>
-  -->
+
+  <!--+
+      | Include all Avalon configuration files from cocoon-sitemap-impl
+      +-->
+  <include src="/META-INF/cocoon/avalon/cocoon-core-continuations-manager.xconf"/>
+
+  <!--+
+      | Include all Avalon configuration files from cocoon-sitemap-components
+      +-->
+  <!--include src="/META-INF/cocoon/avalon/cocoon-core-modules-input.xconf"/-->
+  <include src="/META-INF/cocoon/avalon/cocoon-core-modules-input-flowscript.xconf"/>
+  <include src="/META-INF/cocoon/avalon/cocoon-core-modules-output.xconf"/>
+
+  <!--+
+      | Include all Avalon configuration files from cocoon-core
+      +-->
+  <include src="/META-INF/cocoon/avalon/cocoon-core-fam.xconf"/>
+  <include src="/META-INF/cocoon/avalon/cocoon-core-i18n-bundles.xconf"/>
+  <include src="/META-INF/cocoon/avalon/cocoon-core-include-cache-manager.xconf"/>
+  <include src="/META-INF/cocoon/avalon/cocoon-core-sitemapcomponents.xconf"/>
+  <include src="/META-INF/cocoon/avalon/cocoon-core-source-factories.xconf"/>
+
 </cocoon>

Added: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/core.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/core.xml?rev=575942&view=auto
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/core.xml
(added)
+++ cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/core.xml
Sat Sep 15 10:16:13 2007
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
+-->
+<!--+
+    | Publish components from core
+    |
+    | @version $Id$
+    +-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:osgi="http://www.springframework.org/schema/osgi"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+                           http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
+
+  <import resource="../cocoon/spring/cocoon-core-applicationContext.xml"/>
+  <import resource="../cocoon/spring/cocoon-core-caching-source.xml"/>
+
+  <osgi:reference id="org.apache.cocoon.thread.RunnableManager" interface="org.apache.cocoon.thread.RunnableManager"/>
+</beans>
\ No newline at end of file

Propchange: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/core.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/core.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-impl.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-impl.xml?rev=575942&r1=575941&r2=575942&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-impl.xml
(original)
+++ cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-impl.xml
Sat Sep 15 10:16:13 2007
@@ -32,4 +32,7 @@
   <import resource="../cocoon/spring/cocoon-pipeline-impl-cache.xml"/>
 
   <osgi:reference id="org.apache.excalibur.store.Store" interface="org.apache.excalibur.store.Store"/>
+  <osgi:reference id="org.apache.excalibur.store.Store_TransientStore" interface="org.apache.excalibur.store.Store"/>
+  <!-- The id attribute don't allow for Excalibur style bean names -->
+  <alias name="org.apache.excalibur.store.Store_TransientStore" alias="org.apache.excalibur.store.Store/TransientStore"/>
 </beans>

Added: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/sitemap-impl.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/sitemap-impl.xml?rev=575942&view=auto
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/sitemap-impl.xml
(added)
+++ cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/sitemap-impl.xml
Sat Sep 15 10:16:13 2007
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
+-->
+<!--+
+    | Publish components from sitemap-impl
+    |
+    | @version $Id$
+    +-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:osgi="http://www.springframework.org/schema/osgi"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+                           http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
+
+  <import resource="../cocoon/spring/CocoonEntryObjectModelProvider.xml"/>
+  <import resource="../cocoon/spring/cocoon-xml-avalon.xml"/>
+  <import resource="../cocoon/spring/LegacySitemapStringTemplateParser.xml"/>
+  <import resource="../cocoon/spring/NOPVariableResolver.xml"/>
+  <import resource="../cocoon/spring/PreparedVariableResolver.xml"/>
+  <import resource="../cocoon/spring/StringTemplateParserVariableResolver.xml"/>
+
+  <osgi:reference id="org.xml.sax.EntityResolver" interface="org.xml.sax.EntityResolver"/>
+  <osgi:reference id="org.apache.cocoon.el.ExpressionFactory" interface="org.apache.cocoon.el.ExpressionFactory"/>
+</beans>
\ No newline at end of file

Propchange: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/sitemap-impl.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/sitemap-impl.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/ObjectModel.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/ObjectModel.xml?rev=575942&view=auto
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/ObjectModel.xml
(added)
+++ cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/ObjectModel.xml
Sat Sep 15 10:16:13 2007
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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.
+-->
+<!-- SVN $Id$ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:aop="http://www.springframework.org/schema/aop"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+  
+  <!-- Default implementation of ObjectModel interface in pipelineComponent scope. -->
+  <bean name="org.apache.cocoon.el.objectmodel.ObjectModel" scope="pipelineComponent"

+        parent="org.apache.cocoon.el.objectmodel.ObjectModel.template">
+    <aop:scoped-proxy proxy-target-class="false"/>
+  </bean>
+  
+</beans>
\ No newline at end of file

Propchange: cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/ObjectModel.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/ObjectModel.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/object-model-providers.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/object-model-providers.xml?rev=575942&r1=575941&r2=575942&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/object-model-providers.xml
(original)
+++ cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/object-model-providers.xml
Sat Sep 15 10:16:13 2007
@@ -30,8 +30,8 @@
 
   <import resource="../cocoon/spring/ObjectModelProviders.xml"/>
 
-  <osgi:service ref="org.apache.cocoon.el.impl.objectmodel.PackagesEntryObjectModelProvider"
+  <osgi:service ref="org.apache.cocoon.el.objectmodel.ObjectModelProvider/Packages"
                 interface="org.apache.cocoon.el.objectmodel.ObjectModelProvider"/>
-  <osgi:service ref="org.apache.cocoon.el.impl.objectmodel.JavaEntryObjectModelProvider"
+  <osgi:service ref="org.apache.cocoon.el.objectmodel.ObjectModelProvider/java"
                 interface="org.apache.cocoon.el.objectmodel.ObjectModelProvider"/>
 </beans>

Added: cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/object-model.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/object-model.xml?rev=575942&view=auto
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/object-model.xml
(added)
+++ cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/object-model.xml
Sat Sep 15 10:16:13 2007
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
+-->
+<!--+
+    | Publish the object model
+    |
+    | @version $Id$
+    +-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:osgi="http://www.springframework.org/schema/osgi"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+                           http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
+
+  <import resource="../cocoon/spring/ObjectModelTemplate.xml"/>
+
+  <osgi:service ref="org.apache.cocoon.el.objectmodel.ObjectModel" interface="org.apache.cocoon.el.objectmodel.ObjectModel"/>
+</beans>
\ No newline at end of file

Propchange: cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/object-model.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/object-model.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-resolver-osgi/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-resolver-osgi/pom.xml?rev=575942&r1=575941&r2=575942&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-resolver-osgi/pom.xml (original)
+++ cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-resolver-osgi/pom.xml Sat Sep 15 10:16:13
2007
@@ -67,6 +67,10 @@
             <Bundle-SymbolicName>
               ${pom.artifactId}
             </Bundle-SymbolicName>
+            <Import-Package>
+              org.xml.sax,
+              *
+            </Import-Package>
             <Private-Package>
               org.apache.cocoon.core.xml.resolver;version=${pkgVersion}
             </Private-Package>

Modified: cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-resolver-osgi/src/main/resources/META-INF/spring/xml-resolver.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-resolver-osgi/src/main/resources/META-INF/spring/xml-resolver.xml?rev=575942&r1=575941&r2=575942&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-resolver-osgi/src/main/resources/META-INF/spring/xml-resolver.xml
(original)
+++ cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-resolver-osgi/src/main/resources/META-INF/spring/xml-resolver.xml
Sat Sep 15 10:16:13 2007
@@ -35,5 +35,5 @@
 
   <import resource="../cocoon/spring/cocoon-xml-resolver.xml"/>
 
-  <osgi:service ref="org.xml.sax.EntityResolver" interface="org.apache.cocoon.core.xml.resolver.CocoonSystemResolver"/>
+  <osgi:service ref="org.xml.sax.EntityResolver" interface="org.xml.sax.EntityResolver"/>
 </beans>



Mime
View raw message