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 2007/09/30 23:03:31 UTC
svn commit: r580787 - in
/cocoon/whiteboard/osgi/core/cocoon-spring-osgi/cocoon-spring-osgi-simple-service/src/main/resources/META-INF/spring:
bundle-context-osgi.xml factory-export-osgi.xml factory-export.xml
Author: danielf
Date: Sun Sep 30 14:03:31 2007
New Revision: 580787
URL: http://svn.apache.org/viewvc?rev=580787&view=rev
Log:
Test cases for the factory export. All tests succeeds.
Added:
cocoon/whiteboard/osgi/core/cocoon-spring-osgi/cocoon-spring-osgi-simple-service/src/main/resources/META-INF/spring/factory-export-osgi.xml (with props)
cocoon/whiteboard/osgi/core/cocoon-spring-osgi/cocoon-spring-osgi-simple-service/src/main/resources/META-INF/spring/factory-export.xml (with props)
Modified:
cocoon/whiteboard/osgi/core/cocoon-spring-osgi/cocoon-spring-osgi-simple-service/src/main/resources/META-INF/spring/bundle-context-osgi.xml
Modified: cocoon/whiteboard/osgi/core/cocoon-spring-osgi/cocoon-spring-osgi-simple-service/src/main/resources/META-INF/spring/bundle-context-osgi.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-spring-osgi/cocoon-spring-osgi-simple-service/src/main/resources/META-INF/spring/bundle-context-osgi.xml?rev=580787&r1=580786&r2=580787&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-spring-osgi/cocoon-spring-osgi-simple-service/src/main/resources/META-INF/spring/bundle-context-osgi.xml (original)
+++ cocoon/whiteboard/osgi/core/cocoon-spring-osgi/cocoon-spring-osgi-simple-service/src/main/resources/META-INF/spring/bundle-context-osgi.xml Sun Sep 30 14:03:31 2007
@@ -23,10 +23,12 @@
<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"
+ xmlns:cosgi="http://cocoon.apache.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">
+ http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd
+ http://cocoon.apache.org/schema/osgi http://cocoon.apache.org/schema/osgi/spring-osgi.xsd">
- <osgi:service id="simpleServiceOsgi" ref="simpleService" interface="org.apache.cocoon.springosgi.simpleservice.SimpleService"/>
+ <cosgi:service id="simpleServiceOsgi" ref="simpleService" interface="org.apache.cocoon.springosgi.simpleservice.SimpleService"/>
<osgi:service id="simpleServiceOsgi.A" ref="simpleService.A" interface="org.apache.cocoon.springosgi.simpleservice.SimpleService">
<osgi:service-properties>
Added: cocoon/whiteboard/osgi/core/cocoon-spring-osgi/cocoon-spring-osgi-simple-service/src/main/resources/META-INF/spring/factory-export-osgi.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-spring-osgi/cocoon-spring-osgi-simple-service/src/main/resources/META-INF/spring/factory-export-osgi.xml?rev=580787&view=auto
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-spring-osgi/cocoon-spring-osgi-simple-service/src/main/resources/META-INF/spring/factory-export-osgi.xml (added)
+++ cocoon/whiteboard/osgi/core/cocoon-spring-osgi/cocoon-spring-osgi-simple-service/src/main/resources/META-INF/spring/factory-export-osgi.xml Sun Sep 30 14:03:31 2007
@@ -0,0 +1,37 @@
+<?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.
+-->
+<!--+
+ | @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"
+ xmlns:cosgi="http://cocoon.apache.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
+ http://cocoon.apache.org/schema/osgi http://cocoon.apache.org/schema/osgi/spring-osgi.xsd">
+
+ <cosgi:service id="simpleServiceFE1Osgi" ref="simpleService.fe1" factory-export="true"
+ interface="org.apache.cocoon.springosgi.simpleservice.SimpleService"/>
+
+ <cosgi:service id="simpleServiceFE2Osgi" ref="simpleService.fe2" factory-export="true"
+ interface="org.apache.cocoon.springosgi.simpleservice.SimpleService"/>
+
+</beans>
\ No newline at end of file
Propchange: cocoon/whiteboard/osgi/core/cocoon-spring-osgi/cocoon-spring-osgi-simple-service/src/main/resources/META-INF/spring/factory-export-osgi.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/whiteboard/osgi/core/cocoon-spring-osgi/cocoon-spring-osgi-simple-service/src/main/resources/META-INF/spring/factory-export-osgi.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: cocoon/whiteboard/osgi/core/cocoon-spring-osgi/cocoon-spring-osgi-simple-service/src/main/resources/META-INF/spring/factory-export.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-spring-osgi/cocoon-spring-osgi-simple-service/src/main/resources/META-INF/spring/factory-export.xml?rev=580787&view=auto
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-spring-osgi/cocoon-spring-osgi-simple-service/src/main/resources/META-INF/spring/factory-export.xml (added)
+++ cocoon/whiteboard/osgi/core/cocoon-spring-osgi/cocoon-spring-osgi-simple-service/src/main/resources/META-INF/spring/factory-export.xml Sun Sep 30 14:03:31 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.
+-->
+<!--+
+ | @version $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.xsd">
+
+ <bean name="simpleService.fe1" class="org.apache.cocoon.springosgi.simpleservice.impl.SimpleServiceImpl">
+ <property name="message" value="fe1"/>
+ </bean>
+
+ <bean name="simpleService.fe2" scope="prototype" class="org.apache.cocoon.springosgi.simpleservice.impl.SimpleServiceImpl">
+ <property name="message" value="fe2"/>
+ </bean>
+
+</beans>
\ No newline at end of file
Propchange: cocoon/whiteboard/osgi/core/cocoon-spring-osgi/cocoon-spring-osgi-simple-service/src/main/resources/META-INF/spring/factory-export.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/whiteboard/osgi/core/cocoon-spring-osgi/cocoon-spring-osgi-simple-service/src/main/resources/META-INF/spring/factory-export.xml
------------------------------------------------------------------------------
svn:keywords = Id