cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dani...@apache.org
Subject svn commit: r570944 - in /cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-impl-osgi: pom.xml src/ src/main/ src/main/resources/ src/main/resources/META-INF/ src/main/resources/META-INF/spring/ src/main/resources/META-INF/spring/xml-parser.xml
Date Wed, 29 Aug 2007 21:44:04 GMT
Author: danielf
Date: Wed Aug 29 14:44:03 2007
New Revision: 570944

URL: http://svn.apache.org/viewvc?rev=570944&view=rev
Log:
Publishing the SAX and DOM XML-parsers as OSGi services and removing the package export of
the impl package.

Added:
    cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-impl-osgi/src/
    cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-impl-osgi/src/main/
    cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-impl-osgi/src/main/resources/
    cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-impl-osgi/src/main/resources/META-INF/
    cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-impl-osgi/src/main/resources/META-INF/spring/
    cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-impl-osgi/src/main/resources/META-INF/spring/xml-parser.xml
  (with props)
Modified:
    cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-impl-osgi/pom.xml

Modified: cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-impl-osgi/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-impl-osgi/pom.xml?rev=570944&r1=570943&r2=570944&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-impl-osgi/pom.xml (original)
+++ cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-impl-osgi/pom.xml Wed Aug 29 14:44:03
2007
@@ -87,10 +87,11 @@
             <Bundle-SymbolicName>
               ${pom.artifactId}
             </Bundle-SymbolicName>
-            <Export-Package>
+            <Private-Package>
               org.apache.cocoon.core.xml.impl;version=${pkgVersion}
-            </Export-Package>
+            </Private-Package>
             <Include-Resource>
+              src/main/resources/,
               @${pkgArtifactId}-${pkgVersion}.jar!/META-INF/*,
               @${pkgArtifactId}-${pkgVersion}.jar!/META-INF/cocoon/spring/cocoon-xml-impl.xml
             </Include-Resource>

Added: cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-impl-osgi/src/main/resources/META-INF/spring/xml-parser.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-impl-osgi/src/main/resources/META-INF/spring/xml-parser.xml?rev=570944&view=auto
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-impl-osgi/src/main/resources/META-INF/spring/xml-parser.xml
(added)
+++ cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-impl-osgi/src/main/resources/META-INF/spring/xml-parser.xml
Wed Aug 29 14:44:03 2007
@@ -0,0 +1,36 @@
+<?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 DOM and SAX parsers
+    |
+    | @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-xml-impl.xml"/>
+
+  <osgi:service ref="org.apache.cocoon.core.xml.DOMParser" interface="org.apache.cocoon.core.xml.DOMParser"/>
+
+  <osgi:service ref="org.apache.cocoon.core.xml.SAXParser" interface="org.apache.cocoon.core.xml.SAXParser"/>
+</beans>
\ No newline at end of file

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

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



Mime
View raw message