geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r997288 [2/2] - in /geronimo/sandbox/rick/serviceloader: ./ geronimo-endorsed-serviceloader/ geronimo-endorsed-serviceloader/src/ geronimo-endorsed-serviceloader/src/main/ geronimo-endorsed-serviceloader/src/main/java/ geronimo-endorsed-ser...
Date Wed, 15 Sep 2010 11:34:04 GMT
Added: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itesta/src/main/resources/META-INF/services/org.apache.geronimo.serviceloader.itestapi.NoAccess
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itesta/src/main/resources/META-INF/services/org.apache.geronimo.serviceloader.itestapi.NoAccess?rev=997288&view=auto
==============================================================================
--- geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itesta/src/main/resources/META-INF/services/org.apache.geronimo.serviceloader.itestapi.NoAccess (added)
+++ geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itesta/src/main/resources/META-INF/services/org.apache.geronimo.serviceloader.itestapi.NoAccess Wed Sep 15 11:34:01 2010
@@ -0,0 +1,18 @@
+# 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.
+# private no-argument constructor for newInstance()
+org.apache.geronimo.serviceloader.itesta.NoAccess

Added: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itesta/src/main/resources/META-INF/services/org.apache.geronimo.serviceloader.itestapi.NoClass
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itesta/src/main/resources/META-INF/services/org.apache.geronimo.serviceloader.itestapi.NoClass?rev=997288&view=auto
==============================================================================
--- geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itesta/src/main/resources/META-INF/services/org.apache.geronimo.serviceloader.itestapi.NoClass (added)
+++ geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itesta/src/main/resources/META-INF/services/org.apache.geronimo.serviceloader.itestapi.NoClass Wed Sep 15 11:34:01 2010
@@ -0,0 +1,18 @@
+# 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.
+# This class should not be loadable...used to test error conditions.
+org.apache.geronimo.serviceloader.itesta.NoClass

Added: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itesta/src/main/resources/META-INF/services/org.apache.geronimo.serviceloader.itestapi.NoConstructor
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itesta/src/main/resources/META-INF/services/org.apache.geronimo.serviceloader.itestapi.NoConstructor?rev=997288&view=auto
==============================================================================
--- geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itesta/src/main/resources/META-INF/services/org.apache.geronimo.serviceloader.itestapi.NoConstructor (added)
+++ geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itesta/src/main/resources/META-INF/services/org.apache.geronimo.serviceloader.itestapi.NoConstructor Wed Sep 15 11:34:01 2010
@@ -0,0 +1,18 @@
+# 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.
+# No no-argument constructor for newInstance()
+org.apache.geronimo.serviceloader.itesta.NoConstructor

Added: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itesta/src/main/resources/META-INF/services/org.apache.geronimo.serviceloader.itestapi.TestInterface
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itesta/src/main/resources/META-INF/services/org.apache.geronimo.serviceloader.itestapi.TestInterface?rev=997288&view=auto
==============================================================================
--- geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itesta/src/main/resources/META-INF/services/org.apache.geronimo.serviceloader.itestapi.TestInterface (added)
+++ geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itesta/src/main/resources/META-INF/services/org.apache.geronimo.serviceloader.itestapi.TestInterface Wed Sep 15 11:34:01 2010
@@ -0,0 +1,20 @@
+# 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.
+# Tests normal class mapping...NOTE:  this uses
+# TestTarget2 to ensure we're picking up the
+# services version, not the providers one.
+org.apache.geronimo.serviceloader.itesta.TestTarget

Added: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itesta/src/main/resources/META-INF/services/org.apache.geronimo.serviceloader.itestapi.TestInterface2
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itesta/src/main/resources/META-INF/services/org.apache.geronimo.serviceloader.itestapi.TestInterface2?rev=997288&view=auto
==============================================================================
--- geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itesta/src/main/resources/META-INF/services/org.apache.geronimo.serviceloader.itestapi.TestInterface2 (added)
+++ geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itesta/src/main/resources/META-INF/services/org.apache.geronimo.serviceloader.itestapi.TestInterface2 Wed Sep 15 11:34:01 2010
@@ -0,0 +1,19 @@
+# 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.
+# Tests normal class mapping for multiple providers
+org.apache.geronimo.serviceloader.itesta.TestTarget2
+org.apache.geronimo.serviceloader.itesta.TestTarget2a

Added: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/pom.xml?rev=997288&view=auto
==============================================================================
--- geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/pom.xml (added)
+++ geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/pom.xml Wed Sep 15 11:34:01 2010
@@ -0,0 +1,58 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.components</groupId>
+        <artifactId>geronimo-serviceloader</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.components</groupId>
+    <artifactId>geronimo-serviceloader-itestapi</artifactId>
+    <packaging>bundle</packaging>
+    <name>Apache Geronimo OSGi ServiceLoader integration tests interfaces</name>
+    <version>1.0-SNAPSHOT</version>
+
+    <description>
+Interface classes used to drive the service requests.
+    </description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Export-package>*</Export-package>
+                        <Bundle-SymbolicName>${groupId}.${artifactId};singleton=true</Bundle-SymbolicName>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/BadClass.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/BadClass.java?rev=997288&view=auto
==============================================================================
--- geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/BadClass.java (added)
+++ geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/BadClass.java Wed Sep 15 11:34:01 2010
@@ -0,0 +1,24 @@
+/**
+ * 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.
+ */
+package org.apache.geronimo.serviceloader.itestapi;
+
+public interface BadClass {
+    // this is just a tagging interface for purposes of the service request 
+}
+

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/BadClass.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/BadClass.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/BadClass.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/NoAccess.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/NoAccess.java?rev=997288&view=auto
==============================================================================
--- geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/NoAccess.java (added)
+++ geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/NoAccess.java Wed Sep 15 11:34:01 2010
@@ -0,0 +1,24 @@
+/**
+ * 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.
+ */
+package org.apache.geronimo.serviceloader.itestapi;
+
+public interface NoAccess {
+    // this is just a tagging interface for purposes of the service request 
+}
+

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/NoAccess.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/NoAccess.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/NoAccess.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/NoClass.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/NoClass.java?rev=997288&view=auto
==============================================================================
--- geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/NoClass.java (added)
+++ geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/NoClass.java Wed Sep 15 11:34:01 2010
@@ -0,0 +1,24 @@
+/**
+ * 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.
+ */
+package org.apache.geronimo.serviceloader.itestapi;
+
+public interface NoClass {
+    // this is just a tagging interface for purposes of the service request 
+}
+

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/NoClass.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/NoClass.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/NoClass.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/NoConstructor.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/NoConstructor.java?rev=997288&view=auto
==============================================================================
--- geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/NoConstructor.java (added)
+++ geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/NoConstructor.java Wed Sep 15 11:34:01 2010
@@ -0,0 +1,24 @@
+/**
+ * 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.
+ */
+package org.apache.geronimo.serviceloader.itestapi;
+
+public interface NoConstructor {
+    // this is just a tagging interface for purposes of the service request 
+}
+

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/NoConstructor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/NoConstructor.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/NoConstructor.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/NotFound.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/NotFound.java?rev=997288&view=auto
==============================================================================
--- geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/NotFound.java (added)
+++ geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/NotFound.java Wed Sep 15 11:34:01 2010
@@ -0,0 +1,24 @@
+/**
+ * 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.
+ */
+package org.apache.geronimo.serviceloader.itestapi;
+
+public interface NotFound {
+    // this is just a tagging interface for purposes of the service request 
+}
+

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/NotFound.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/NotFound.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/NotFound.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/TestInterface.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/TestInterface.java?rev=997288&view=auto
==============================================================================
--- geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/TestInterface.java (added)
+++ geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/TestInterface.java Wed Sep 15 11:34:01 2010
@@ -0,0 +1,24 @@
+/**
+ * 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.
+ */
+package org.apache.geronimo.serviceloader.itestapi;
+
+public interface TestInterface {
+    // this is just a tagging interface for purposes of the service request 
+}
+

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/TestInterface.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/TestInterface.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/TestInterface.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/TestInterface2.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/TestInterface2.java?rev=997288&view=auto
==============================================================================
--- geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/TestInterface2.java (added)
+++ geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/TestInterface2.java Wed Sep 15 11:34:01 2010
@@ -0,0 +1,24 @@
+/**
+ * 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.
+ */
+package org.apache.geronimo.serviceloader.itestapi;
+
+public interface TestInterface2 {
+    // this is just a tagging interface for purposes of the service request 
+}
+

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/TestInterface2.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/TestInterface2.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/TestInterface2.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/TestInterface3.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/TestInterface3.java?rev=997288&view=auto
==============================================================================
--- geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/TestInterface3.java (added)
+++ geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/TestInterface3.java Wed Sep 15 11:34:01 2010
@@ -0,0 +1,24 @@
+/**
+ * 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.
+ */
+package org.apache.geronimo.serviceloader.itestapi;
+
+public interface TestInterface3 {
+    // this is just a tagging interface for purposes of the service request 
+}
+

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/TestInterface3.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/TestInterface3.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestapi/src/main/java/org/apache/geronimo/serviceloader/itestapi/TestInterface3.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestb/pom.xml?rev=997288&view=auto
==============================================================================
--- geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestb/pom.xml (added)
+++ geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestb/pom.xml Wed Sep 15 11:34:01 2010
@@ -0,0 +1,67 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.components</groupId>
+        <artifactId>geronimo-serviceloader</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.components</groupId>
+    <artifactId>geronimo-serviceloader-itestb</artifactId>
+    <packaging>bundle</packaging>
+    <name>Apache Geronimo OSGi ServiceLoader integration tests bundle itestb</name>
+    <version>1.0-SNAPSHOT</version>
+
+    <description>
+Separately built test bundle for use in the various integration tests.  This
+bundle will have provider and services definitions used to test different class
+provider resolution scenarios.
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.components</groupId>
+            <artifactId>geronimo-serviceloader-itestapi</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${groupId}.${artifactId};singleton=true</Bundle-SymbolicName>
+                        <Private-Package>org.apache.geronimo.serviceloader.testb</Private-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestb/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestb/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestb/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestb/src/main/java/org/apache/geronimo/serviceloader/itestb/TestTarget.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestb/src/main/java/org/apache/geronimo/serviceloader/itestb/TestTarget.java?rev=997288&view=auto
==============================================================================
--- geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestb/src/main/java/org/apache/geronimo/serviceloader/itestb/TestTarget.java (added)
+++ geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestb/src/main/java/org/apache/geronimo/serviceloader/itestb/TestTarget.java Wed Sep 15 11:34:01 2010
@@ -0,0 +1,37 @@
+/**
+ * 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.
+ */
+package org.apache.geronimo.serviceloader.itestb;
+
+public class TestTarget  implements org.apache.geronimo.serviceloader.itestapi.TestInterface {
+    public TestTarget() {
+    }
+
+    @Override
+    /**
+     * The toString method is a simple means for determining
+     * which class has been instantiated without requiring
+     * interface classes to be exported by the test bundles.
+     *
+     * @return The unique identifier for this class.
+     */
+    public String toString() {
+        return "TestTarget";
+    }
+}
+

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestb/src/main/java/org/apache/geronimo/serviceloader/itestb/TestTarget.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestb/src/main/java/org/apache/geronimo/serviceloader/itestb/TestTarget.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestb/src/main/java/org/apache/geronimo/serviceloader/itestb/TestTarget.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestb/src/main/java/org/apache/geronimo/serviceloader/itestb/TestTarget2.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestb/src/main/java/org/apache/geronimo/serviceloader/itestb/TestTarget2.java?rev=997288&view=auto
==============================================================================
--- geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestb/src/main/java/org/apache/geronimo/serviceloader/itestb/TestTarget2.java (added)
+++ geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestb/src/main/java/org/apache/geronimo/serviceloader/itestb/TestTarget2.java Wed Sep 15 11:34:01 2010
@@ -0,0 +1,37 @@
+/**
+ * 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.
+ */
+package org.apache.geronimo.serviceloader.itestb;
+
+public class TestTarget2  implements org.apache.geronimo.serviceloader.itestapi.TestInterface2 {
+    public TestTarget2() {
+    }
+
+    @Override
+    /**
+     * The toString method is a simple means for determining
+     * which class has been instantiated without requiring
+     * interface classes to be exported by the test bundles.
+     *
+     * @return The unique identifier for this class.
+     */
+    public String toString() {
+        return "TestTarget2";
+    }
+}
+

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestb/src/main/java/org/apache/geronimo/serviceloader/itestb/TestTarget2.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestb/src/main/java/org/apache/geronimo/serviceloader/itestb/TestTarget2.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestb/src/main/java/org/apache/geronimo/serviceloader/itestb/TestTarget2.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestb/src/main/resources/META-INF/services/org.apache.geronimo.serviceloader.itestapi.TestInterface
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestb/src/main/resources/META-INF/services/org.apache.geronimo.serviceloader.itestapi.TestInterface?rev=997288&view=auto
==============================================================================
--- geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestb/src/main/resources/META-INF/services/org.apache.geronimo.serviceloader.itestapi.TestInterface (added)
+++ geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestb/src/main/resources/META-INF/services/org.apache.geronimo.serviceloader.itestapi.TestInterface Wed Sep 15 11:34:01 2010
@@ -0,0 +1,20 @@
+# 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.
+# Tests normal class mapping...NOTE:  this uses
+# TestTarget2 to ensure we're picking up the
+# services version, not the providers one.
+org.apache.geronimo.serviceloader.itestb.TestTarget2

Added: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestb/src/main/resources/META-INF/services/org.apache.geronimo.serviceloader.itestapi.TestInterface2
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestb/src/main/resources/META-INF/services/org.apache.geronimo.serviceloader.itestapi.TestInterface2?rev=997288&view=auto
==============================================================================
--- geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestb/src/main/resources/META-INF/services/org.apache.geronimo.serviceloader.itestapi.TestInterface2 (added)
+++ geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itestb/src/main/resources/META-INF/services/org.apache.geronimo.serviceloader.itestapi.TestInterface2 Wed Sep 15 11:34:01 2010
@@ -0,0 +1,18 @@
+# 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.
+# Tests normal class mapping for multiple providers
+org.apache.geronimo.serviceloader.itestb.TestTarget2

Added: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/pom.xml?rev=997288&view=auto
==============================================================================
--- geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/pom.xml (added)
+++ geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/pom.xml Wed Sep 15 11:34:01 2010
@@ -0,0 +1,197 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+
+    <parent>
+        <groupId>org.apache.geronimo.components</groupId>
+        <artifactId>geronimo-serviceloader</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.components</groupId>
+    <artifactId>geronimo-serviceloader-itests</artifactId>
+    <packaging>jar</packaging>
+    <name>Apache Geronimo OSGi ServiceLoader integration tests</name>
+    <version>1.0-SNAPSHOT</version>
+
+    <description>
+This project contains integration tests to ensure that the code
+in the locator will function correctly if used outside of an OSGi framework.
+These tests will have no dependnecies on any OSGi classes when run, and should
+function without error.
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.components</groupId>
+            <artifactId>geronimo-serviceloader-itestapi</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.components</groupId>
+            <artifactId>geronimo-serviceloader-itesta</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.components</groupId>
+            <artifactId>geronimo-serviceloader-itestb</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.components</groupId>
+            <artifactId>geronimo-serviceloader-activator</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.components</groupId>
+            <artifactId>geronimo-endorsed-serviceloader</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-osgi-registry</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam-junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam-container-default</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam-junit-extender-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.swissbox</groupId>
+            <artifactId>pax-swissbox-tinybundles</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.components</groupId>
+                                    <artifactId>geronimo-endorsed-serviceloader</artifactId>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.servicemix.tooling</groupId>
+                <artifactId>depends-maven-plugin</artifactId>
+                <version>1.1</version>
+                <executions>
+                    <execution>
+                        <id>generate-depends-file</id>
+                        <goals>
+                            <goal>generate-depends-file</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                    <failIfNoTests>false</failIfNoTests>
+                    <excludes>
+                        <exclude>**/OSGi*.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>failsafe-maven-plugin</artifactId>
+                <version>2.4.3-alpha-1</version>
+                <executions>
+                    <execution>
+                        <id>integration-test</id>
+                        <goals>
+                            <goal>integration-test</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>verify</id>
+                        <goals>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                    <failIfNoTests>false</failIfNoTests>
+                    <includes>
+                        <include>**/OSGiServiceLoaderTest.java</include>
+                    </includes>
+                    <systemProperties>
+                        <property>
+                            <name>java.endorsed.dirs</name>
+                            <value>${project.build.directory}/endorsed</value>
+                        </property>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/OSGiServiceLoaderTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/OSGiServiceLoaderTest.java?rev=997288&view=auto
==============================================================================
--- geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/OSGiServiceLoaderTest.java (added)
+++ geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/OSGiServiceLoaderTest.java Wed Sep 15 11:34:01 2010
@@ -0,0 +1,205 @@
+/*
+ * 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.
+ */
+package org.apache.geronimo.serviceloader.itest;
+
+import java.util.ArrayList; 
+import java.util.Iterator;
+import java.util.List;
+import java.util.ServiceLoader; 
+import java.util.ServiceConfigurationError; 
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.omg.CosNaming.NamingContextPackage.NotFound;
+import org.ops4j.pax.exam.CoreOptions;
+import static org.ops4j.pax.exam.CoreOptions.*;
+import org.ops4j.pax.exam.Customizer;
+import org.ops4j.pax.exam.Inject;
+import org.ops4j.pax.exam.Option;
+import static org.ops4j.pax.exam.OptionUtils.combine;
+import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
+import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.*;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+
+@RunWith(JUnit4TestRunner.class)
+public class OSGiServiceLoaderTest {
+    @Inject
+    protected BundleContext bundleContext;
+
+    @org.ops4j.pax.exam.junit.Configuration
+    public static Option[] configuration() throws Exception {
+        Option[] options = options(
+            bootDelegationPackage("sun.*"), 
+            bootDelegationPackage("com.sun.*"), 
+            bootDelegationPackage("org.apache.geronimo.serviceloader"), 
+            systemProperty("java.endorsed.dirs").value(System.getProperty("java.endorsed.dirs")), 
+            mavenBundle("org.apache.geronimo.specs", "geronimo-osgi-registry"),
+            mavenBundle("org.apache.geronimo.components", "geronimo-serviceloader-activator"),
+            // bundle containing test interface classes 
+            mavenBundle("org.apache.geronimo.components", "geronimo-serviceloader-itestapi"),
+            // bundle containing test resources
+            mavenBundle("org.apache.geronimo.components", "geronimo-serviceloader-itesta"),
+            // this bundle opts out of the SPI-Provider status
+            mavenBundle("org.apache.geronimo.components", "geronimo-serviceloader-itestb"),
+            mavenBundle("org.ops4j.pax.logging", "pax-logging-api"),
+            felix(),
+            equinox().version("3.5.0")
+        );
+        options = updateOptions(options);
+        return options;
+    }
+
+
+    @Test
+    public void testServiceLocator() throws Exception {
+        Bundle bundle1 = getInstalledBundle("org.apache.geronimo.components.geronimo-serviceloader-itesta");
+
+        // now testing the services lookup and instantiation mechanism.  These should all be satisfied by
+        // the extender rather than loaded from the classpath.
+        Object service = getService(org.apache.geronimo.serviceloader.itestapi.TestInterface.class);
+        assertNotNull(service);
+        // this should return an instance created from the services definition
+        assertEquals("org.apache.geronimo.serviceloader.itesta.TestTarget", service.getClass().getName());
+
+        // we expect a new instance on each call.  Verify that the instances are different
+        Object service2 = getService(org.apache.geronimo.serviceloader.itestapi.TestInterface.class);
+        assertNotNull(service2);
+        // this should return an instance created from the services definition
+        assertEquals("org.apache.geronimo.serviceloader.itesta.TestTarget", service2.getClass().getName());
+        assertNotSame(service, service2);
+
+        // now testing a multiple instances get.  This should only pick up the definition from the
+        // bundle that includes the SPI-Provider header (testa)
+        List services = getServices(org.apache.geronimo.serviceloader.itestapi.TestInterface.class);
+        assertNotNull(services);
+        assertEquals(1, services.size());
+        // this should return an instance created from the services definition
+        assertEquals("org.apache.geronimo.serviceloader.itesta.TestTarget", services.get(0).getClass().getName());
+        // these should be different instances
+        assertNotSame(service, services.get(0));
+
+        // this is multiple instances defined in a single services file.
+        services = getServices(org.apache.geronimo.serviceloader.itestapi.TestInterface2.class); 
+        assertNotNull(services);
+        assertEquals(2, services.size());
+        // this should return an instance created from the services definition
+        assertEquals("org.apache.geronimo.serviceloader.itesta.TestTarget2", services.get(0).getClass().getName());
+        assertEquals("org.apache.geronimo.serviceloader.itesta.TestTarget2a", services.get(1).getClass().getName());
+
+        // this should not be found
+        service = getService(org.apache.geronimo.serviceloader.itestapi.NotFound.class); 
+        assertNull(service);
+
+        // this should result in an exception
+        try {
+            service = getService(org.apache.geronimo.serviceloader.itestapi.BadClass.class); 
+            fail("Expected ServiceConfigrationError not thrown");
+        } catch (ServiceConfigurationError e) {
+        }
+
+        // this should result in an exception
+        try {
+            service = getService(org.apache.geronimo.serviceloader.itestapi.NoConstructor.class); 
+            fail("Expected ServiceConfigrationError not thrown");
+        } catch (ServiceConfigurationError e) {
+        }
+
+        // this should result in an exception
+        try {
+            service = getService(org.apache.geronimo.serviceloader.itestapi.NoAccess.class); 
+            fail("Expected ServiceConfigrationError not thrown");
+        } catch (ServiceConfigurationError e) {
+        }
+
+        // now stop the first bundle, which should remove the service defintions.
+        bundle1.stop();
+
+        // repeat the first queries, which should fail now
+        service = getService(org.apache.geronimo.serviceloader.itestapi.TestInterface.class);
+        assertNull(service);
+    }
+
+    protected Bundle getInstalledBundle(String symbolicName) {
+        for (Bundle b : bundleContext.getBundles()) {
+            if (b.getSymbolicName().equals(symbolicName)) {
+                return b;
+            }
+        }
+        return null;
+    }
+
+    public static MavenArtifactProvisionOption mavenBundle(String groupId, String artifactId) {
+        return CoreOptions.mavenBundle().groupId(groupId).artifactId(artifactId).versionAsInProject();
+    }
+
+    protected static Option[] updateOptions(Option[] options) {
+        // We need to add pax-exam-junit here when running with the ibm
+        // jdk to avoid the following exception during the test run:
+        // ClassNotFoundException: org.ops4j.pax.exam.junit.Configuration
+        if ("IBM Corporation".equals(System.getProperty("java.vendor"))) {
+            Option[] ibmOptions = options(
+                wrappedBundle(mavenBundle("org.ops4j.pax.exam", "pax-exam-junit"))
+            );
+            options = combine(ibmOptions, options);
+        }
+
+        return options;
+    }
+    
+    /**
+     * Load a single service using the ServiceLoader. 
+     * 
+     * @param target The target class.
+     * 
+     * @return The service instance, or null if not found. 
+     */
+    protected Object getService(Class<?> target) {
+        for (Object service : ServiceLoader.load(target)) {
+            return service; 
+        }
+        return null; 
+    }
+    
+    /**
+     * Load all matching service instances  
+     * 
+     * @param target The target class.
+     * 
+     * @return The service instance, or null if not found. 
+     */
+    protected List getServices(Class<?> target) {
+        List services = new ArrayList(); 
+        
+        for (Object service : ServiceLoader.load(target)) {
+            services.add(service);
+        }
+        return services; 
+    }
+}

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/OSGiServiceLoaderTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/OSGiServiceLoaderTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/OSGiServiceLoaderTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTarget.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTarget.java?rev=997288&view=auto
==============================================================================
--- geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTarget.java (added)
+++ geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTarget.java Wed Sep 15 11:34:01 2010
@@ -0,0 +1,37 @@
+/**
+ * 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.
+ */
+package org.apache.geronimo.serviceloader.itest;
+
+public class TestTarget {
+    public TestTarget() {
+    }
+
+    @Override
+    /**
+     * The toString method is a simple means for determining
+     * which class has been instantiated without requiring
+     * interface classes to be exported by the test bundles.
+     *
+     * @return The unique identifier for this class.
+     */
+    public String toString() {
+        return "TestTarget";
+    }
+}
+

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTarget.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTarget.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTarget.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTarget2.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTarget2.java?rev=997288&view=auto
==============================================================================
--- geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTarget2.java (added)
+++ geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTarget2.java Wed Sep 15 11:34:01 2010
@@ -0,0 +1,37 @@
+/**
+ * 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.
+ */
+package org.apache.geronimo.serviceloader.itest;
+
+public class TestTarget2 {
+    public TestTarget2() {
+    }
+
+    @Override
+    /**
+     * The toString method is a simple means for determining
+     * which class has been instantiated without requiring
+     * interface classes to be exported by the test bundles.
+     *
+     * @return The unique identifier for this class.
+     */
+    public String toString() {
+        return "TestTarget2";
+    }
+}
+

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTarget2.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTarget2.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTarget2.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTarget3.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTarget3.java?rev=997288&view=auto
==============================================================================
--- geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTarget3.java (added)
+++ geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTarget3.java Wed Sep 15 11:34:01 2010
@@ -0,0 +1,37 @@
+/**
+ * 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.
+ */
+package org.apache.geronimo.serviceloader.itest;
+
+public class TestTarget3 {
+    public TestTarget3() {
+    }
+
+    @Override
+    /**
+     * The toString method is a simple means for determining
+     * which class has been instantiated without requiring
+     * interface classes to be exported by the test bundles.
+     *
+     * @return The unique identifier for this class.
+     */
+    public String toString() {
+        return "TestTarget3";
+    }
+}
+

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTarget3.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTarget3.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTarget3.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTargetLocal.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTargetLocal.java?rev=997288&view=auto
==============================================================================
--- geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTargetLocal.java (added)
+++ geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTargetLocal.java Wed Sep 15 11:34:01 2010
@@ -0,0 +1,37 @@
+/**
+ * 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.
+ */
+package org.apache.geronimo.serviceloader.itest;
+
+public class TestTargetLocal {
+    public TestTargetLocal() {
+    }
+
+    @Override
+    /**
+     * The toString method is a simple means for determining
+     * which class has been instantiated without requiring
+     * interface classes to be exported by the test bundles.
+     *
+     * @return The unique identifier for this class.
+     */
+    public String toString() {
+        return "TestTarget";
+    }
+}
+

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTargetLocal.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTargetLocal.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTargetLocal.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTargetTwo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTargetTwo.java?rev=997288&view=auto
==============================================================================
--- geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTargetTwo.java (added)
+++ geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTargetTwo.java Wed Sep 15 11:34:01 2010
@@ -0,0 +1,37 @@
+/**
+ * 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.
+ */
+package org.apache.geronimo.serviceloader.itest;
+
+public class TestTargetTwo {
+    public TestTargetTwo() {
+    }
+
+    @Override
+    /**
+     * The toString method is a simple means for determining
+     * which class has been instantiated without requiring
+     * interface classes to be exported by the test bundles.
+     *
+     * @return The unique identifier for this class.
+     */
+    public String toString() {
+        return "TestTargetTwo";
+    }
+}
+

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTargetTwo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTargetTwo.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/rick/serviceloader/geronimo-serviceloader-itests/src/test/java/org/apache/geronimo/serviceloader/itest/TestTargetTwo.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/rick/serviceloader/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rick/serviceloader/pom.xml?rev=997288&view=auto
==============================================================================
--- geronimo/sandbox/rick/serviceloader/pom.xml (added)
+++ geronimo/sandbox/rick/serviceloader/pom.xml Wed Sep 15 11:34:01 2010
@@ -0,0 +1,203 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.genesis</groupId>
+        <artifactId>genesis-java6-flava</artifactId>
+        <version>2.0</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.components</groupId>
+    <artifactId>geronimo-serviceloader</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Geronimo OSGi replacement ServiceLoader support</name>
+    <version>1.0-SNAPSHOT</version>
+
+    <description>
+This project is a set of jars and bundles that allow replacing the jre 
+provided ServiceLoader implementation with one that can use the Geronimo 
+OSGi provider registry for resolving service instances. 
+    </description>
+
+    <url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
+    <distributionManagement>
+        <site>
+            <id>apache-website</id>
+            <url>${site.deploy.url}/maven/${siteId}/${version}</url>
+        </site>
+    </distributionManagement>
+
+    <properties>
+        <siteId>specs/${artifactId}</siteId>
+    </properties>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/components/geronimo-service-loader/trunk/</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/components/geronimo-service-loader/trunk/</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/geronimo/components/geronimo-service-loader/trunk/</url>
+    </scm>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-osgi-registry</artifactId>
+                <version>1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.components</groupId>
+                <artifactId>geronimo-serviceloader-activator</artifactId>
+                <version>${version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.components</groupId>
+                <artifactId>geronimo-endorsed-serviceloader</artifactId>
+                <version>${version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.components</groupId>
+                <artifactId>geronimo-serviceloader-itestapi</artifactId>
+                <version>${version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.components</groupId>
+                <artifactId>geronimo-serviceloader-itesta</artifactId>
+                <version>${version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.components</groupId>
+                <artifactId>geronimo-serviceloader-itestb</artifactId>
+                <version>${version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.core</artifactId>
+                <version>4.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.compendium</artifactId>
+                <version>4.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam</artifactId>
+                <version>1.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam-junit</artifactId>
+                <version>1.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.5</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam-container-default</artifactId>
+                <version>1.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam-junit-extender-impl</artifactId>
+                <version>1.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.swissbox</groupId>
+                <artifactId>pax-swissbox-tinybundles</artifactId>
+                <version>1.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.logging</groupId>
+                <artifactId>pax-logging-api</artifactId>
+                <version>1.4</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.servicemix.tooling</groupId>
+                    <artifactId>depends-maven-plugin</artifactId>
+                    <version>1.1</version>
+                    <executions>
+                        <execution>
+                            <id>generate-depends-file</id>
+                            <goals>
+                                <goal>generate-depends-file</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                        <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                        <failIfNoTests>false</failIfNoTests>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>failsafe-maven-plugin</artifactId>
+                    <version>2.4.3-alpha-1</version>
+                    <executions>
+                        <execution>
+                            <id>integration-test</id>
+                            <goals>
+                                <goal>integration-test</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>verify</id>
+                            <goals>
+                                <goal>verify</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                    <configuration>
+                        <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                        <failIfNoTests>false</failIfNoTests>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+    <modules>
+        <module>geronimo-endorsed-serviceloader</module>
+        <module>geronimo-serviceloader-activator</module>
+        <module>geronimo-serviceloader-itestapi</module>
+        <module>geronimo-serviceloader-itesta</module>
+        <module>geronimo-serviceloader-itestb</module>
+        <module>geronimo-serviceloader-itests</module>
+    </modules>
+
+</project>

Propchange: geronimo/sandbox/rick/serviceloader/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/rick/serviceloader/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/rick/serviceloader/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message