You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by gn...@apache.org on 2009/04/19 21:37:03 UTC
svn commit: r766502 - in /geronimo/sandbox/blueprint: blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/ blueprint-sample/ blueprint-sample/src/main/java/org/apache/geronimo/blueprint/ blueprint-sample/src/main/java/org/apache/geronim...

Author: gnodet
Date: Sun Apr 19 19:37:02 2009
New Revision: 766502

URL: http://svn.apache.org/viewvc?rev=766502&view=rev
Log:
Use a more coherent package name for the sample

Added:
    geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/
      - copied from r766501, geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/osgi/
    geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/
      - copied from r766501, geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/osgi/example/
Removed:
    geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/example/
    geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/osgi/
Modified:
    geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/Test.java
    geronimo/sandbox/blueprint/blueprint-sample/pom.xml
    geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/Activator.java
    geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/Bar.java
    geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/CurrencyTypeConverter.java
    geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/DateTypeConverter.java
    geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/Foo.java
    geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/FooListener.java
    geronimo/sandbox/blueprint/blueprint-sample/src/main/resources/OSGI-INF/blueprint/config.xml

Modified: geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/Test.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/Test.java?rev=766502&r1=766501&r2=766502&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/Test.java (original)
+++ geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/Test.java Sun Apr 19 19:37:02 2009
@@ -21,8 +21,8 @@
 import java.net.URLDecoder;
 
 import org.apache.servicemix.kernel.testing.support.AbstractIntegrationTest;
-import org.apache.geronimo.osgi.example.Foo;
-import org.apache.geronimo.osgi.example.Bar;
+import org.apache.geronimo.blueprint.sample.Foo;
+import org.apache.geronimo.blueprint.sample.Bar;
 import org.osgi.framework.Bundle;
 import org.osgi.service.blueprint.context.ModuleContext;
 import org.springframework.core.io.Resource;

Modified: geronimo/sandbox/blueprint/blueprint-sample/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-sample/pom.xml?rev=766502&r1=766501&r2=766502&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-sample/pom.xml (original)
+++ geronimo/sandbox/blueprint/blueprint-sample/pom.xml Sun Apr 19 19:37:02 2009
@@ -37,7 +37,7 @@
                     <instructions>
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
                         <Bundle-Activator>
-                            org.apache.geronimo.osgi.example.Activator
+                            org.apache.geronimo.blueprint.sample.Activator
                         </Bundle-Activator>
 <!--
                         <Bundle-Blueprint>/test.xml</Bundle-Blueprint>

Modified: geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/Activator.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/Activator.java?rev=766502&r1=766501&r2=766502&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/Activator.java (original)
+++ geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/Activator.java Sun Apr 19 19:37:02 2009
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.osgi.example;
+package org.apache.geronimo.blueprint.sample;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;

Modified: geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/Bar.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/Bar.java?rev=766502&r1=766501&r2=766502&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/Bar.java (original)
+++ geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/Bar.java Sun Apr 19 19:37:02 2009
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.osgi.example;
+package org.apache.geronimo.blueprint.sample;
 
 import java.util.List;
 

Modified: geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/CurrencyTypeConverter.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/CurrencyTypeConverter.java?rev=766502&r1=766501&r2=766502&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/CurrencyTypeConverter.java (original)
+++ geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/CurrencyTypeConverter.java Sun Apr 19 19:37:02 2009
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.osgi.example;
+package org.apache.geronimo.blueprint.sample;
 
 import java.util.Currency;
 

Modified: geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/DateTypeConverter.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/DateTypeConverter.java?rev=766502&r1=766501&r2=766502&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/DateTypeConverter.java (original)
+++ geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/DateTypeConverter.java Sun Apr 19 19:37:02 2009
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.osgi.example;
+package org.apache.geronimo.blueprint.sample;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;

Modified: geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/Foo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/Foo.java?rev=766502&r1=766501&r2=766502&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/Foo.java (original)
+++ geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/Foo.java Sun Apr 19 19:37:02 2009
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.osgi.example;
+package org.apache.geronimo.blueprint.sample;
 
 import java.io.Serializable;
 import java.util.Currency;

Modified: geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/FooListener.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/FooListener.java?rev=766502&r1=766501&r2=766502&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/FooListener.java (original)
+++ geronimo/sandbox/blueprint/blueprint-sample/src/main/java/org/apache/geronimo/blueprint/sample/FooListener.java Sun Apr 19 19:37:02 2009
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.osgi.example;
+package org.apache.geronimo.blueprint.sample;
 
 import java.io.Serializable;
 import java.util.Map;

Modified: geronimo/sandbox/blueprint/blueprint-sample/src/main/resources/OSGI-INF/blueprint/config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-sample/src/main/resources/OSGI-INF/blueprint/config.xml?rev=766502&r1=766501&r2=766502&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-sample/src/main/resources/OSGI-INF/blueprint/config.xml (original)
+++ geronimo/sandbox/blueprint/blueprint-sample/src/main/resources/OSGI-INF/blueprint/config.xml Sun Apr 19 19:37:02 2009
@@ -3,13 +3,13 @@
 <components xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
     <type-converters>
-            <component id="converter1" class="org.apache.geronimo.osgi.example.DateTypeConverter">
+            <component id="converter1" class="org.apache.geronimo.blueprint.sample.DateTypeConverter">
                 <property name="format" value="yyyy.MM.dd"/>
             </component>
             <ref component="converter2"/>
     </type-converters>
 
-    <component id="foo" class="org.apache.geronimo.osgi.example.Foo">
+    <component id="foo" class="org.apache.geronimo.blueprint.sample.Foo">
         <property name="a" value="5" />
         <property name="b" value="10" />
         <property name="bar" ref="bar" />
@@ -21,7 +21,7 @@
         </property>
     </component>
 
-    <component id="bar" class="org.apache.geronimo.osgi.example.Bar">
+    <component id="bar" class="org.apache.geronimo.blueprint.sample.Bar">
         <property name="value"><value>Hello FooBar</value></property>
         <property name="context" ref="bundleContext"/>
         <property name="list">
@@ -32,7 +32,7 @@
         </property>
     </component>
 
-    <component id="converter2" class="org.apache.geronimo.osgi.example.CurrencyTypeConverter"/>
+    <component id="converter2" class="org.apache.geronimo.blueprint.sample.CurrencyTypeConverter"/>
 
     <service ref="foo" auto-export="all-classes">
         <registration-listener ref="fooListener"         
@@ -44,7 +44,7 @@
         </service-properties>
     </service>
     
-    <component id="fooListener" class="org.apache.geronimo.osgi.example.FooListener"/>
+    <component id="fooListener" class="org.apache.geronimo.blueprint.sample.FooListener"/>
     
 </components>