Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Refactor to rationalize package names and bundle names.

  • Loading branch information...
commit 67e99de28cd0210a5ebb82169b96160e39e81d45 1 parent dab90f1
@ieb ieb authored
Showing with 341 additions and 342 deletions.
  1. +1 −1  nonslingtests/bundles/jpatest/pom.xml
  2. +1 −1  ...ingtests/bundles/jpatest/src/main/java/org/sakaiproject/{kernel2 → kernel}/jpatest/model/Greeting.java
  3. +1 −1  nonslingtests/bundles/jpatest/src/main/java/org/sakaiproject/{kernel2 → kernel}/jpatest/model/Hello.java
  4. +1 −1  slingtests/osgikernel/README.txt
  5. +43 −43 slingtests/osgikernel/app-bundles/pom.xml
  6. +8 −14 slingtests/osgikernel/app/pom.xml
  7. +1 −1  slingtests/osgikernel/bundles/activation/pom.xml
  8. +6 −6 slingtests/osgikernel/bundles/filters/pom.xml
  9. +7 −7 slingtests/osgikernel/bundles/guice/pom.xml
  10. +2 −2 ...ikernel/bundles/guice/src/test/java/org/sakaiproject/{kernel2 → kernel}/guice/DummyGuiceActivator.java
  11. +2 −2 .../osgikernel/bundles/guice/src/test/java/org/sakaiproject/{kernel2 → kernel}/guice/DummyOsgiModule.java
  12. +2 −2 ...es/guice/src/test/java/org/sakaiproject/{kernel2 → kernel}/guice/DummyOsgiModuleWithConfiguration.java
  13. +1 −1  ...rnel/bundles/guice/src/test/java/org/sakaiproject/{kernel2 → kernel}/guice/DummyServiceInterfaceA.java
  14. +1 −1  ...rnel/bundles/guice/src/test/java/org/sakaiproject/{kernel2 → kernel}/guice/DummyServiceInterfaceB.java
  15. +2 −2 ...rnel/bundles/guice/src/test/java/org/sakaiproject/{kernel2 → kernel}/guice/DummyServiceWithExport.java
  16. +2 −2 ...l/bundles/guice/src/test/java/org/sakaiproject/{kernel2 → kernel}/guice/DummyServiceWithoutExport.java
  17. +4 −4 ...ikernel/bundles/guice/src/test/java/org/sakaiproject/{kernel2 → kernel}/guice/TestGuiceActivation.java
  18. +3 −3 slingtests/osgikernel/bundles/guiceuser/pom.xml
  19. +6 −6 ...rnel/bundles/guiceuser/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/guiceuser/GuiceUser.java
  20. +27 −0 slingtests/osgikernel/bundles/guiceuser/src/main/java/org/sakaiproject/kernel/guiceuser/TestModule.java
  21. +1 −1  ...bundles/guiceuser/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/guiceuser/api/InterfaceA.java
  22. +1 −1  ...bundles/guiceuser/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/guiceuser/api/InterfaceB.java
  23. +1 −1  ...bundles/guiceuser/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/guiceuser/api/InterfaceD.java
  24. +1 −1  ...bundles/guiceuser/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/guiceuser/api/InterfaceE.java
  25. +1 −1  ...bundles/guiceuser/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/guiceuser/api/InterfaceF.java
  26. +2 −2 ...bundles/guiceuser/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/guiceuser/impl/ConcreteA.java
  27. +2 −2 ...bundles/guiceuser/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/guiceuser/impl/ConcreteB.java
  28. +5 −5 ...bundles/guiceuser/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/guiceuser/impl/ConcreteD.java
  29. +5 −5 ...bundles/guiceuser/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/guiceuser/impl/ConcreteE.java
  30. +3 −3 ...bundles/guiceuser/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/guiceuser/impl/FProvider.java
  31. +15 −0 slingtests/osgikernel/bundles/guiceuser/src/main/java/org/sakaiproject/kernel/guiceuser/impl/InjectableC.java
  32. +0 −27 slingtests/osgikernel/bundles/guiceuser/src/main/java/org/sakaiproject/kernel2/osgi/guiceuser/TestModule.java
  33. +0 −15 ...ts/osgikernel/bundles/guiceuser/src/main/java/org/sakaiproject/kernel2/osgi/guiceuser/impl/InjectableC.java
  34. +1 −1  slingtests/osgikernel/bundles/jaxb/pom.xml
  35. +2 −2 slingtests/osgikernel/bundles/jaxp-api/pom.xml
  36. +2 −2 slingtests/osgikernel/bundles/jaxrs/pom.xml
  37. +6 −6 slingtests/osgikernel/bundles/jcr/pom.xml
  38. +2 −2 slingtests/osgikernel/bundles/jetty-config/pom.xml
  39. +1 −1  slingtests/osgikernel/bundles/jpa/pom.xml
  40. +1 −1  slingtests/osgikernel/bundles/jpacore/pom.xml
  41. +11 −11 slingtests/osgikernel/bundles/jpaexample/pom.xml
  42. +1 −1  ...el/bundles/jpaexample/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/jpaexample/Activator.java
  43. +1 −1  ...dles/jpaexample/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/jpaexample/ActivatorModule.java
  44. +2 −2 ...l/bundles/jpaexample/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/jpaexample/JpaExample.java
  45. +1 −1  ...aexample/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/jpaexample/jpa/model/ExampleModel.java
  46. +1 −1  slingtests/osgikernel/bundles/jpaexample/src/main/resources/META-INF/orm.xml
  47. +1 −1  slingtests/osgikernel/bundles/jpaexample/src/main/resources/META-INF/persistence.xml
  48. +3 −3 slingtests/osgikernel/bundles/jpahelloworld/pom.xml
  49. +1 −1  ...jpahelloworld/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/jpahelloworld/model/Greeting.java
  50. +1 −1  ...es/jpahelloworld/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/jpahelloworld/model/Hello.java
  51. +1 −1  slingtests/osgikernel/bundles/jpahelloworld/src/main/resources/META-INF/orm.xml
  52. +1 −1  slingtests/osgikernel/bundles/jpahelloworld/src/main/resources/META-INF/persistence.xml
  53. +3 −3 slingtests/osgikernel/bundles/jpaprovider/pom.xml
  54. +6 −6 ...ovider/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/jpaprovider/AmalgamatingClassloader.java
  55. +1 −1  .../src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/jpaprovider/BundleGatheringResourceFinder.java
  56. +1 −1  ...vider/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/jpaprovider/PersistenceBundleMonitor.java
  57. +1 −1  ...in/java/org/sakaiproject/{kernel2/osgi → kernel}/jpaprovider/SakaiPersistenceInitializationHelper.java
  58. +1 −1  ...vider/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/jpaprovider/SakaiPersistenceProvider.java
  59. +2 −2 ...les/jpaprovider/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/jpaprovider/UrlEnumeration.java
  60. +1 −1  ...jpaprovider/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/jpaprovider/UserManagerFactory.java
  61. +1 −1  ...s/jpaprovider/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/jpaprovider/model/SystemUser.java
  62. +1 −1  ...ovider/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/jpaprovider/xstream/EntityConverter.java
  63. +1 −1  .../jpaprovider/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/jpaprovider/xstream/OrmEntity.java
  64. +1 −1  ...paprovider/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/jpaprovider/xstream/OrmSettings.java
  65. +1 −1  ...er/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/jpaprovider/xstream/PersistenceSettings.java
  66. +1 −1  ...ovider/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/jpaprovider/xstream/PersistenceUnit.java
  67. +1 −1  ...s/jpaprovider/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/jpaprovider/xstream/Property.java
  68. +1 −1  ...ider/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/jpaprovider/xstream/PropertyConverter.java
  69. +1 −1  ...ovider/src/main/java/org/sakaiproject/{kernel2/osgi → kernel}/jpaprovider/xstream/XStreamWritable.java
  70. +1 −1  slingtests/osgikernel/bundles/jpaprovider/src/main/resources/META-INF/kernel-orm.xml
  71. +1 −1  slingtests/osgikernel/bundles/jpaprovider/src/main/resources/META-INF/kernel-persistence.xml
  72. +2 −1  ...r/src/test/java/org/sakaiproject/{kernel2/osgi/jpaprovider → kernel/jpaprovider/test}/DummyBundle.java
  73. +1 −1  ...est/java/org/sakaiproject/{kernel2/osgi/jpaprovider → kernel/jpaprovider/test}/DummyBundleContext.java
  74. +4 −2 ...rc/test/java/org/sakaiproject/{kernel2/osgi/jpaprovider → kernel/jpaprovider/test}/DummyJpaBundle.java
  75. +8 −6 ...r/src/test/java/org/sakaiproject/{kernel2/osgi/jpaprovider → kernel/jpaprovider/test}/TestMerging.java
  76. +7 −7 ...r/src/test/java/org/sakaiproject/{kernel2/osgi/jpaprovider → kernel/jpaprovider/test}/TestParsing.java
  77. +2 −2 slingtests/osgikernel/bundles/jpaprovider/src/test/resources/orm1.xml
  78. +2 −2 slingtests/osgikernel/bundles/jpaprovider/src/test/resources/orm2.xml
  79. +2 −2 slingtests/osgikernel/bundles/jpaprovider/src/test/resources/persistence1.xml
  80. +2 −2 slingtests/osgikernel/bundles/jpaprovider/src/test/resources/persistence2.xml
  81. +1 −1  slingtests/osgikernel/bundles/jsr173/pom.xml
  82. +2 −2 slingtests/osgikernel/bundles/kernel/pom.xml
  83. +8 −8 slingtests/osgikernel/bundles/lifecycle/pom.xml
  84. +4 −4 slingtests/osgikernel/bundles/locking/pom.xml
  85. +4 −4 slingtests/osgikernel/bundles/memory/pom.xml
  86. +1 −1  ...osgikernel/bundles/memory/src/test/java/org/sakaiproject/{kernel2 → kernel}/osgi/memory/TestCache.java
  87. +8 −8 slingtests/osgikernel/bundles/messaging/pom.xml
  88. +13 −13 slingtests/osgikernel/bundles/{db → persistence}/pom.xml
  89. 0  ...undles/{db → persistence}/src/main/java/org/sakaiproject/kernel/api/persistence/DataSourceService.java
  90. 0  ...osgikernel/bundles/{db → persistence}/src/main/java/org/sakaiproject/kernel/persistence/Activator.java
  91. 0  ...rnel/bundles/{db → persistence}/src/main/java/org/sakaiproject/kernel/persistence/ActivatorModule.java
  92. 0  .../bundles/{db → persistence}/src/main/java/org/sakaiproject/kernel/persistence/EntityManagerHolder.java
  93. 0  .../bundles/{db → persistence}/src/main/java/org/sakaiproject/kernel/persistence/ScopedEntityManager.java
  94. 0  ...s/{db → persistence}/src/main/java/org/sakaiproject/kernel/persistence/dbcp/DataSourceServiceImpl.java
  95. 0  ... → persistence}/src/main/java/org/sakaiproject/kernel/persistence/dynamic/AmalgamatingClassloader.java
  96. 0  ...; persistence}/src/main/java/org/sakaiproject/kernel/persistence/dynamic/BundleGatheringResourceFinder.java
  97. 0  ...→ persistence}/src/main/java/org/sakaiproject/kernel/persistence/dynamic/PersistenceBundleMonitor.java
  98. 0  ...stence}/src/main/java/org/sakaiproject/kernel/persistence/dynamic/SakaiPersistenceInitializationHelper.java
  99. 0  ...→ persistence}/src/main/java/org/sakaiproject/kernel/persistence/dynamic/SakaiPersistenceProvider.java
  100. 0  ... → persistence}/src/main/java/org/sakaiproject/kernel/persistence/dynamic/xstream/EntityConverter.java
  101. 0  ...es/{db → persistence}/src/main/java/org/sakaiproject/kernel/persistence/dynamic/xstream/OrmEntity.java
  102. 0  .../{db → persistence}/src/main/java/org/sakaiproject/kernel/persistence/dynamic/xstream/OrmSettings.java
  103. 0  ...rr; persistence}/src/main/java/org/sakaiproject/kernel/persistence/dynamic/xstream/PersistenceSettings.java
  104. 0  ... → persistence}/src/main/java/org/sakaiproject/kernel/persistence/dynamic/xstream/PersistenceUnit.java
  105. 0  ...les/{db → persistence}/src/main/java/org/sakaiproject/kernel/persistence/dynamic/xstream/Property.java
  106. 0  ...rarr; persistence}/src/main/java/org/sakaiproject/kernel/persistence/dynamic/xstream/PropertyConverter.java
  107. 0  ... → persistence}/src/main/java/org/sakaiproject/kernel/persistence/dynamic/xstream/XStreamWritable.java
  108. 0  ...arr; persistence}/src/main/java/org/sakaiproject/kernel/persistence/eclipselink/EnableIntegrityChecker.java
  109. 0  ...ersistence}/src/main/java/org/sakaiproject/kernel/persistence/eclipselink/EntityManagerFactoryProvider.java
  110. 0  ...rr; persistence}/src/main/java/org/sakaiproject/kernel/persistence/geronimo/TransactionManagerProvider.java
  111. 0  slingtests/osgikernel/bundles/{db → persistence}/src/main/resources/META-INF/kernel-orm.xml
  112. 0  slingtests/osgikernel/bundles/{db → persistence}/src/main/resources/META-INF/kernel-persistence.xml
  113. +2 −2 ...t/kernel2 → persistence/src/test/java/org/sakaiproject/kernel}/persistence/dynamic/DummyJpaBundle.java
  114. +3 −3 ...ject/kernel2 → persistence/src/test/java/org/sakaiproject/kernel}/persistence/dynamic/TestMerging.java
  115. +2 −2 ...ject/kernel2 → persistence/src/test/java/org/sakaiproject/kernel}/persistence/dynamic/TestParsing.java
  116. +3 −3 slingtests/osgikernel/bundles/{db → persistence}/src/test/resources/orm1.xml
  117. +3 −3 slingtests/osgikernel/bundles/{db → persistence}/src/test/resources/orm2.xml
  118. +2 −2 slingtests/osgikernel/bundles/{db → persistence}/src/test/resources/persistence1.xml
  119. +2 −2 slingtests/osgikernel/bundles/{db → persistence}/src/test/resources/persistence2.xml
  120. +4 −4 slingtests/osgikernel/bundles/registry/pom.xml
  121. +4 −4 slingtests/osgikernel/bundles/session/pom.xml
  122. +2 −2 slingtests/osgikernel/bundles/sessiontest/pom.xml
  123. +1 −1  ...undles/sessiontest/src/main/java/org/sakaiproject/{kernel2 → kernel}/osgi/sessiontest/SessionTest.java
  124. +4 −4 slingtests/osgikernel/libraries/testutils/pom.xml
  125. +2 −2 .../testutils/src/main/java/org/sakaiproject/{kernel2 → kernel}/testutils/easymock/DictionaryMatcher.java
  126. +2 −2 ...tutils/src/main/java/org/sakaiproject/{kernel2 → kernel}/testutils/easymock/UnorderedArrayMatcher.java
  127. +1 −1  .../libraries/testutils/src/main/java/org/sakaiproject/{kernel2 → kernel}/testutils/osgi/DummyBundle.java
  128. +1 −1  ...ies/testutils/src/main/java/org/sakaiproject/{kernel2 → kernel}/testutils/osgi/DummyBundleContext.java
  129. +4 −4 slingtests/osgikernel/libraries/utils/pom.xml
  130. +2 −2 slingtests/osgikernel/pom.xml
  131. +1 −1  slingtests/osgikernel/testscripts/testCreateUsers.sh
View
2  nonslingtests/bundles/jpatest/pom.xml
@@ -16,7 +16,7 @@
<artifactId>base</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
- <artifactId>org.sakaiproject.kernel2.jpatest</artifactId>
+ <artifactId>org.sakaiproject.kernel.jpatest</artifactId>
<packaging>jar</packaging>
<version>0.1-SNAPSHOT</version>
<name>Sakai JPA Mysql Hello World</name>
View
2  .../sakaiproject/kernel2/jpatest/model/Greeting.java → ...g/sakaiproject/kernel/jpatest/model/Greeting.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.jpatest.model;
+package org.sakaiproject.kernel.jpatest.model;
import java.io.Serializable;
import javax.persistence.Basic;
View
2  ...org/sakaiproject/kernel2/jpatest/model/Hello.java → .../org/sakaiproject/kernel/jpatest/model/Hello.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.jpatest.model;
+package org.sakaiproject.kernel.jpatest.model;
import org.eclipse.persistence.jpa.PersistenceProvider;
View
2  slingtests/osgikernel/README.txt
@@ -2,7 +2,7 @@ This is the Sling based K2 that uses OSGi.
To run
mvn clean install
-java -jar app/target/org.sakaiproject.kernel2.osgi.app-0.1-SNAPSHOT.jar
+java -jar app/target/org.sakaiproject.kernel.app-0.1-SNAPSHOT.jar
This will start Felix configured with Sling and the Sakai K2 bundles.
View
86 slingtests/osgikernel/app-bundles/pom.xml
@@ -13,11 +13,11 @@
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.sakaiproject.kernel2.osgi</groupId>
+ <groupId>org.sakaiproject.kernel</groupId>
<artifactId>base</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
- <artifactId>org.sakaiproject.kernel2.osgi.app-bundles</artifactId>
+ <artifactId>org.sakaiproject.kernel.app-bundles</artifactId>
<packaging>jar</packaging>
<version>0.1-SNAPSHOT</version>
<name>Sakai K2 Bundles Collection</name>
@@ -41,111 +41,111 @@
</build>
<dependencies>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.kernel</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.configuration</artifactId>
<version>0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.guice</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.guice</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.guiceuser</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.guiceuser</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.jpaexample</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.jpaexample</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.memory</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.memory</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.registry</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.registry</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.lifecycle</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.lifecycle</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.db</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.persistence</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.utils</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.utils</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.jaxrs</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.jaxrs</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.filters</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.filters</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.session</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.session</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.locking</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.locking</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.jcr</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.jcr</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<!-- OSGi bundles -->
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
+ <groupId>org.sakaiproject.kernel</groupId>
<artifactId>org.eclipse.persistence.core</artifactId>
<version>1.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
+ <groupId>org.sakaiproject.kernel</groupId>
<artifactId>org.eclipse.persistence.jpa</artifactId>
<version>1.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
+ <groupId>org.sakaiproject.kernel</groupId>
<artifactId>javax.xml.bind.jsr173</artifactId>
<version>1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
+ <groupId>org.sakaiproject.kernel</groupId>
<artifactId>javax.xml.bind.jaxb</artifactId>
<version>2.1</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
+ <groupId>org.sakaiproject.kernel</groupId>
<artifactId>javax.activation</artifactId>
<version>1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.jaxp-api</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.jaxp-api</artifactId>
<version>1.3.0</version>
<scope>provided</scope>
</dependency>
@@ -208,7 +208,7 @@
<goal>copy-dependencies</goal>
</goals>
<configuration>
- <includeArtifactIds>javax.activation,javax.xml.bind.jsr173,javax.xml.bind.jaxb,org.sakaiproject.kernel2.osgi.jaxp-api</includeArtifactIds>
+ <includeArtifactIds>javax.activation,javax.xml.bind.jsr173,javax.xml.bind.jaxb,org.sakaiproject.kernel.jaxp-api</includeArtifactIds>
<excludeTransitive>true</excludeTransitive>
<outputDirectory> ${project.build.outputDirectory}/resources/bundles/1
</outputDirectory>
@@ -220,7 +220,7 @@
<goal>copy-dependencies</goal>
</goals>
<configuration>
- <includeArtifactIds>org.sakaiproject.kernel2.osgi.kernel,javax.persistence,org.sakaiproject.kernel2.osgi.guice,org.sakaiproject.kernel2.osgi.utils,org.eclipse.persistence.core,org.eclipse.persistence.jpa,org.eclipse.persistence.asm,org.eclipse.persistence.antlr</includeArtifactIds>
+ <includeArtifactIds>org.sakaiproject.kernel.configuration,javax.persistence,org.sakaiproject.kernel.guice,org.sakaiproject.kernel.utils,org.eclipse.persistence.core,org.eclipse.persistence.jpa,org.eclipse.persistence.asm,org.eclipse.persistence.antlr</includeArtifactIds>
<excludeTransitive>true</excludeTransitive>
<outputDirectory> ${project.build.outputDirectory}/resources/bundles/10
</outputDirectory>
@@ -232,7 +232,7 @@
<goal>copy-dependencies</goal>
</goals>
<configuration>
- <includeArtifactIds>org.sakaiproject.kernel2.osgi.registry,org.sakaiproject.kernel2.osgi.memory,org.sakaiproject.kernel2.osgi.session,org.sakaiproject.kernel2.osgi.guiceuser,org.sakaiproject.kernel2.osgi.jpaprovider</includeArtifactIds>
+ <includeArtifactIds>org.sakaiproject.kernel.registry,org.sakaiproject.kernel.memory,org.sakaiproject.kernel.session,org.sakaiproject.kernel.guiceuser,org.sakaiproject.kernel.jpaprovider</includeArtifactIds>
<excludeTransitive>true</excludeTransitive>
<outputDirectory> ${project.build.outputDirectory}/resources/bundles/12
</outputDirectory>
@@ -244,7 +244,7 @@
<goal>copy-dependencies</goal>
</goals>
<configuration>
- <includeArtifactIds>org.sakaiproject.kernel2.osgi.jcr,org.sakaiproject.kernel2.osgi.db,org.sakaiproject.kernel2.osgi.locking</includeArtifactIds>
+ <includeArtifactIds>org.sakaiproject.kernel.jcr,org.sakaiproject.kernel.persistence,org.sakaiproject.kernel.locking</includeArtifactIds>
<excludeTransitive>true</excludeTransitive>
<outputDirectory> ${project.build.outputDirectory}/resources/bundles/15
</outputDirectory>
@@ -256,7 +256,7 @@
<goal>copy-dependencies</goal>
</goals>
<configuration>
- <includeArtifactIds>org.sakaiproject.kernel2.osgi.filters,org.sakaiproject.kernel2.osgi.jaxrs,org.sakaiproject.kernel2.osgi.jpaexample,org.sakaiproject.kernel2.osgi.jpahelloworld</includeArtifactIds>
+ <includeArtifactIds>org.sakaiproject.kernel.filters,org.sakaiproject.kernel.jaxrs,org.sakaiproject.kernel.jpaexample,org.sakaiproject.kernel.jpahelloworld</includeArtifactIds>
<excludeTransitive>true</excludeTransitive>
<outputDirectory> ${project.build.outputDirectory}/resources/bundles/20
</outputDirectory>
@@ -268,7 +268,7 @@
<goal>copy-dependencies</goal>
</goals>
<configuration>
- <includeArtifactIds>org.sakaiproject.kernel2.osgi.lifecycle,org.apache.sling.scripting.python,org.apache.sling.scripting.ruby,org.apache.sling.fsresource</includeArtifactIds>
+ <includeArtifactIds>org.sakaiproject.kernel.lifecycle,org.apache.sling.scripting.python,org.apache.sling.scripting.ruby,org.apache.sling.fsresource</includeArtifactIds>
<excludeTransitive>true</excludeTransitive>
<outputDirectory> ${project.build.outputDirectory}/resources/bundles/30
</outputDirectory>
View
22 slingtests/osgikernel/app/pom.xml
@@ -13,11 +13,11 @@
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.sakaiproject.kernel2.osgi</groupId>
+ <groupId>org.sakaiproject.kernel</groupId>
<artifactId>base</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
- <artifactId>org.sakaiproject.kernel2.osgi.app</artifactId>
+ <artifactId>org.sakaiproject.kernel.app</artifactId>
<packaging>jar</packaging>
<version>0.1-SNAPSHOT</version>
<name>Sakai K2 Launchpad Standalone Java Application</name>
@@ -86,7 +86,7 @@
<goal>unpack-dependencies</goal>
</goals>
<configuration>
- <includeArtifactIds> org.sakaiproject.kernel2.osgi.app-bundles </includeArtifactIds>
+ <includeArtifactIds> org.sakaiproject.kernel.app-bundles </includeArtifactIds>
<includes> resources/** </includes>
<excludeTransitive>true</excludeTransitive>
<outputDirectory> ${project.build.outputDirectory} </outputDirectory>
@@ -114,7 +114,7 @@
<goal>copy-dependencies</goal>
</goals>
<configuration>
- <includeArtifactIds> org.sakaiproject.kernel2.osgi.jetty-config </includeArtifactIds>
+ <includeArtifactIds> org.sakaiproject.kernel.jetty-config </includeArtifactIds>
<excludeTransitive>true</excludeTransitive>
<outputDirectory> ${project.build.outputDirectory}/resources/bundles/5
</outputDirectory>
@@ -171,8 +171,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.app-bundles</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.app-bundles</artifactId>
<version>0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -187,18 +187,12 @@
</dependency>
-->
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.jetty-config</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.jetty-config</artifactId>
<version>0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
- <!-- UX loader bundle -->
- <!--
- <dependency> <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.uxloader</artifactId>
- <version>0.1-SNAPSHOT</version> <scope>provided</scope> </dependency>
- -->
</dependencies>
<profiles>
<profile>
View
2  slingtests/osgikernel/bundles/activation/pom.xml
@@ -13,7 +13,7 @@
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.sakaiproject.kernel2.osgi</groupId>
+ <groupId>org.sakaiproject.kernel</groupId>
<artifactId>base</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
View
12 slingtests/osgikernel/bundles/filters/pom.xml
@@ -13,11 +13,11 @@
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.sakaiproject.kernel2.osgi</groupId>
+ <groupId>org.sakaiproject.kernel</groupId>
<artifactId>base</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
- <artifactId>org.sakaiproject.kernel2.osgi.filters</artifactId>
+ <artifactId>org.sakaiproject.kernel.filters</artifactId>
<packaging>bundle</packaging>
<version>0.1-SNAPSHOT</version>
<name>Sakai Filters Bundle</name>
@@ -75,13 +75,13 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.memory</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.memory</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.session</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.session</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
View
14 slingtests/osgikernel/bundles/guice/pom.xml
@@ -13,11 +13,11 @@
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.sakaiproject.kernel2.osgi</groupId>
+ <groupId>org.sakaiproject.kernel</groupId>
<artifactId>base</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
- <artifactId>org.sakaiproject.kernel2.osgi.guice</artifactId>
+ <artifactId>org.sakaiproject.kernel.guice</artifactId>
<packaging>bundle</packaging>
<version>0.1-SNAPSHOT</version>
<name>Sakai Guice Bundle</name>
@@ -74,8 +74,8 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.kernel</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.configuration</artifactId>
<version>0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -99,8 +99,8 @@
<version>4.4</version>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.testutils</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.testutils</artifactId>
<version>0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
@@ -118,4 +118,4 @@
<scope>compile</scope> </dependency>
-->
</dependencies>
-</project>
+</project>
View
4 ...kaiproject/kernel2/guice/DummyGuiceActivator.java → ...akaiproject/kernel/guice/DummyGuiceActivator.java
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.guice;
+package org.sakaiproject.kernel.guice;
import org.osgi.framework.BundleContext;
import org.sakaiproject.kernel.guice.AbstractOsgiModule;
@@ -32,4 +32,4 @@ public DummyGuiceActivator(AbstractOsgiModule module) {
protected AbstractOsgiModule getModule(BundleContext bundleContext) {
return module;
}
-}
+}
View
4 ...g/sakaiproject/kernel2/guice/DummyOsgiModule.java → ...rg/sakaiproject/kernel/guice/DummyOsgiModule.java
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.guice;
+package org.sakaiproject.kernel.guice;
import org.osgi.framework.BundleContext;
import org.sakaiproject.kernel.guice.AbstractOsgiModule;
@@ -30,4 +30,4 @@ public DummyOsgiModule(BundleContext context, Set<Class<?>> exports) {
export(export);
}
}
-}
+}
View
4 ...rnel2/guice/DummyOsgiModuleWithConfiguration.java → ...ernel/guice/DummyOsgiModuleWithConfiguration.java
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.guice;
+package org.sakaiproject.kernel.guice;
import org.osgi.framework.BundleContext;
import org.sakaiproject.kernel.guice.AbstractOsgiModule;
@@ -38,4 +38,4 @@ protected void configure() {
bind(DummyServiceInterfaceB.class).to(DummyServiceWithoutExport.class);
}
-}
+}
View
2  ...project/kernel2/guice/DummyServiceInterfaceA.java → ...iproject/kernel/guice/DummyServiceInterfaceA.java
@@ -1,4 +1,4 @@
-package org.sakaiproject.kernel2.guice;
+package org.sakaiproject.kernel.guice;
public interface DummyServiceInterfaceA {
View
2  ...project/kernel2/guice/DummyServiceInterfaceB.java → ...iproject/kernel/guice/DummyServiceInterfaceB.java
@@ -1,4 +1,4 @@
-package org.sakaiproject.kernel2.guice;
+package org.sakaiproject.kernel.guice;
public interface DummyServiceInterfaceB {
View
4 ...project/kernel2/guice/DummyServiceWithExport.java → ...iproject/kernel/guice/DummyServiceWithExport.java
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.guice;
+package org.sakaiproject.kernel.guice;
import org.sakaiproject.kernel.guice.RequiresStop;
import org.sakaiproject.kernel.guice.ServiceExportDescription;
@@ -29,4 +29,4 @@
public void stop() {
counter++;
}
-}
+}
View
4 ...ject/kernel2/guice/DummyServiceWithoutExport.java → ...oject/kernel/guice/DummyServiceWithoutExport.java
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.guice;
+package org.sakaiproject.kernel.guice;
public class DummyServiceWithoutExport implements DummyServiceInterfaceA, DummyServiceInterfaceB {
-}
+}
View
8 ...kaiproject/kernel2/guice/TestGuiceActivation.java → ...akaiproject/kernel/guice/TestGuiceActivation.java
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.guice;
+package org.sakaiproject.kernel.guice;
import static org.easymock.EasyMock.aryEq;
import static org.easymock.EasyMock.createMock;
@@ -23,9 +23,9 @@
import static org.easymock.EasyMock.isA;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
-import static org.sakaiproject.kernel2.testutils.easymock.DictionaryMatcher.eqDictionary;
-import static org.sakaiproject.kernel2.testutils.easymock.DictionaryMatcher.eqDictionaryUnorderedSubkeys;
-import static org.sakaiproject.kernel2.testutils.easymock.UnorderedArrayMatcher.aryUnorderedEq;
+import static org.sakaiproject.kernel.testutils.easymock.DictionaryMatcher.eqDictionary;
+import static org.sakaiproject.kernel.testutils.easymock.DictionaryMatcher.eqDictionaryUnorderedSubkeys;
+import static org.sakaiproject.kernel.testutils.easymock.UnorderedArrayMatcher.aryUnorderedEq;
import org.junit.Test;
import org.osgi.framework.BundleContext;
View
6 slingtests/osgikernel/bundles/guiceuser/pom.xml
@@ -13,11 +13,11 @@
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.sakaiproject.kernel2.osgi</groupId>
+ <groupId>org.sakaiproject.kernel</groupId>
<artifactId>base</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
- <artifactId>org.sakaiproject.kernel2.osgi.guiceuser</artifactId>
+ <artifactId>org.sakaiproject.kernel.guiceuser</artifactId>
<packaging>bundle</packaging>
<version>0.1-SNAPSHOT</version>
<name>Sakai Guice User Bundle</name>
@@ -34,7 +34,7 @@
<configuration>
<instructions>
<Bundle-Category> sakai-kernel </Bundle-Category>
- <Bundle-Activator>org.sakaiproject.kernel2.osgi.guiceuser.GuiceUser</Bundle-Activator>
+ <Bundle-Activator>org.sakaiproject.kernel.guiceuser.GuiceUser</Bundle-Activator>
<Import-Package> com.google.inject.cglib.reflect, * </Import-Package>
</instructions>
</configuration>
View
12 ...akaiproject/kernel2/osgi/guiceuser/GuiceUser.java → .../org/sakaiproject/kernel/guiceuser/GuiceUser.java
@@ -1,4 +1,4 @@
-package org.sakaiproject.kernel2.osgi.guiceuser;
+package org.sakaiproject.kernel.guiceuser;
import com.google.inject.Guice;
import com.google.inject.Injector;
@@ -6,11 +6,11 @@
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
-import org.sakaiproject.kernel2.osgi.guiceuser.api.InterfaceD;
-import org.sakaiproject.kernel2.osgi.guiceuser.api.InterfaceE;
-import org.sakaiproject.kernel2.osgi.guiceuser.api.InterfaceF;
-import org.sakaiproject.kernel2.osgi.guiceuser.impl.FProvider;
-import org.sakaiproject.kernel2.osgi.guiceuser.impl.InjectableC;
+import org.sakaiproject.kernel.guiceuser.api.InterfaceD;
+import org.sakaiproject.kernel.guiceuser.api.InterfaceE;
+import org.sakaiproject.kernel.guiceuser.api.InterfaceF;
+import org.sakaiproject.kernel.guiceuser.impl.FProvider;
+import org.sakaiproject.kernel.guiceuser.impl.InjectableC;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
View
27 slingtests/osgikernel/bundles/guiceuser/src/main/java/org/sakaiproject/kernel/guiceuser/TestModule.java
@@ -0,0 +1,27 @@
+package org.sakaiproject.kernel.guiceuser;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Scopes;
+
+import org.sakaiproject.kernel.guiceuser.api.InterfaceA;
+import org.sakaiproject.kernel.guiceuser.api.InterfaceB;
+import org.sakaiproject.kernel.guiceuser.api.InterfaceD;
+import org.sakaiproject.kernel.guiceuser.api.InterfaceE;
+import org.sakaiproject.kernel.guiceuser.impl.ConcreteA;
+import org.sakaiproject.kernel.guiceuser.impl.ConcreteB;
+import org.sakaiproject.kernel.guiceuser.impl.ConcreteD;
+import org.sakaiproject.kernel.guiceuser.impl.ConcreteE;
+import org.sakaiproject.kernel.guiceuser.impl.FProvider;
+
+public class TestModule extends AbstractModule {
+
+ @Override
+ protected void configure() {
+ bind(InterfaceA.class).to(ConcreteA.class).in(Scopes.SINGLETON);
+ bind(InterfaceB.class).to(ConcreteB.class).in(Scopes.SINGLETON);
+ bind(InterfaceD.class).to(ConcreteD.class).in(Scopes.SINGLETON);
+ bind(InterfaceE.class).to(ConcreteE.class).in(Scopes.SINGLETON);
+ bind(FProvider.class);
+ }
+
+}
View
2  ...roject/kernel2/osgi/guiceuser/api/InterfaceA.java → ...sakaiproject/kernel/guiceuser/api/InterfaceA.java
@@ -1,4 +1,4 @@
-package org.sakaiproject.kernel2.osgi.guiceuser.api;
+package org.sakaiproject.kernel.guiceuser.api;
public interface InterfaceA {
View
2  ...roject/kernel2/osgi/guiceuser/api/InterfaceB.java → ...sakaiproject/kernel/guiceuser/api/InterfaceB.java
@@ -1,4 +1,4 @@
-package org.sakaiproject.kernel2.osgi.guiceuser.api;
+package org.sakaiproject.kernel.guiceuser.api;
public interface InterfaceB {
View
2  ...roject/kernel2/osgi/guiceuser/api/InterfaceD.java → ...sakaiproject/kernel/guiceuser/api/InterfaceD.java
@@ -1,4 +1,4 @@
-package org.sakaiproject.kernel2.osgi.guiceuser.api;
+package org.sakaiproject.kernel.guiceuser.api;
public interface InterfaceD {
View
2  ...roject/kernel2/osgi/guiceuser/api/InterfaceE.java → ...sakaiproject/kernel/guiceuser/api/InterfaceE.java
@@ -1,4 +1,4 @@
-package org.sakaiproject.kernel2.osgi.guiceuser.api;
+package org.sakaiproject.kernel.guiceuser.api;
public interface InterfaceE {
View
2  ...roject/kernel2/osgi/guiceuser/api/InterfaceF.java → ...sakaiproject/kernel/guiceuser/api/InterfaceF.java
@@ -1,4 +1,4 @@
-package org.sakaiproject.kernel2.osgi.guiceuser.api;
+package org.sakaiproject.kernel.guiceuser.api;
public interface InterfaceF {
View
4 ...roject/kernel2/osgi/guiceuser/impl/ConcreteA.java → ...sakaiproject/kernel/guiceuser/impl/ConcreteA.java
@@ -1,6 +1,6 @@
-package org.sakaiproject.kernel2.osgi.guiceuser.impl;
+package org.sakaiproject.kernel.guiceuser.impl;
-import org.sakaiproject.kernel2.osgi.guiceuser.api.InterfaceA;
+import org.sakaiproject.kernel.guiceuser.api.InterfaceA;
public class ConcreteA implements InterfaceA {
View
4 ...roject/kernel2/osgi/guiceuser/impl/ConcreteB.java → ...sakaiproject/kernel/guiceuser/impl/ConcreteB.java
@@ -1,6 +1,6 @@
-package org.sakaiproject.kernel2.osgi.guiceuser.impl;
+package org.sakaiproject.kernel.guiceuser.impl;
-import org.sakaiproject.kernel2.osgi.guiceuser.api.InterfaceB;
+import org.sakaiproject.kernel.guiceuser.api.InterfaceB;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
View
10 ...roject/kernel2/osgi/guiceuser/impl/ConcreteD.java → ...sakaiproject/kernel/guiceuser/impl/ConcreteD.java
@@ -1,11 +1,11 @@
-package org.sakaiproject.kernel2.osgi.guiceuser.impl;
+package org.sakaiproject.kernel.guiceuser.impl;
import com.google.inject.Inject;
-import org.sakaiproject.kernel2.osgi.guiceuser.api.InterfaceA;
-import org.sakaiproject.kernel2.osgi.guiceuser.api.InterfaceB;
-import org.sakaiproject.kernel2.osgi.guiceuser.api.InterfaceD;
-import org.sakaiproject.kernel2.osgi.guiceuser.api.InterfaceE;
+import org.sakaiproject.kernel.guiceuser.api.InterfaceA;
+import org.sakaiproject.kernel.guiceuser.api.InterfaceB;
+import org.sakaiproject.kernel.guiceuser.api.InterfaceD;
+import org.sakaiproject.kernel.guiceuser.api.InterfaceE;
public class ConcreteD implements InterfaceD {
View
10 ...roject/kernel2/osgi/guiceuser/impl/ConcreteE.java → ...sakaiproject/kernel/guiceuser/impl/ConcreteE.java
@@ -1,11 +1,11 @@
-package org.sakaiproject.kernel2.osgi.guiceuser.impl;
+package org.sakaiproject.kernel.guiceuser.impl;
import com.google.inject.Inject;
-import org.sakaiproject.kernel2.osgi.guiceuser.api.InterfaceA;
-import org.sakaiproject.kernel2.osgi.guiceuser.api.InterfaceB;
-import org.sakaiproject.kernel2.osgi.guiceuser.api.InterfaceD;
-import org.sakaiproject.kernel2.osgi.guiceuser.api.InterfaceE;
+import org.sakaiproject.kernel.guiceuser.api.InterfaceA;
+import org.sakaiproject.kernel.guiceuser.api.InterfaceB;
+import org.sakaiproject.kernel.guiceuser.api.InterfaceD;
+import org.sakaiproject.kernel.guiceuser.api.InterfaceE;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
View
6 ...roject/kernel2/osgi/guiceuser/impl/FProvider.java → ...sakaiproject/kernel/guiceuser/impl/FProvider.java
@@ -1,10 +1,10 @@
-package org.sakaiproject.kernel2.osgi.guiceuser.impl;
+package org.sakaiproject.kernel.guiceuser.impl;
import com.google.inject.Inject;
import com.google.inject.Provider;
-import org.sakaiproject.kernel2.osgi.guiceuser.api.InterfaceE;
-import org.sakaiproject.kernel2.osgi.guiceuser.api.InterfaceF;
+import org.sakaiproject.kernel.guiceuser.api.InterfaceE;
+import org.sakaiproject.kernel.guiceuser.api.InterfaceF;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
View
15 ...tests/osgikernel/bundles/guiceuser/src/main/java/org/sakaiproject/kernel/guiceuser/impl/InjectableC.java
@@ -0,0 +1,15 @@
+package org.sakaiproject.kernel.guiceuser.impl;
+
+import com.google.inject.Inject;
+
+import org.sakaiproject.kernel.guiceuser.api.InterfaceA;
+import org.sakaiproject.kernel.guiceuser.api.InterfaceB;
+
+public class InjectableC {
+
+ @Inject
+ public InjectableC(InterfaceA a, InterfaceB b)
+ {
+ b.printString(a.getHelloWorld());
+ }
+}
View
27 ...tests/osgikernel/bundles/guiceuser/src/main/java/org/sakaiproject/kernel2/osgi/guiceuser/TestModule.java
@@ -1,27 +0,0 @@
-package org.sakaiproject.kernel2.osgi.guiceuser;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.Scopes;
-
-import org.sakaiproject.kernel2.osgi.guiceuser.api.InterfaceA;
-import org.sakaiproject.kernel2.osgi.guiceuser.api.InterfaceB;
-import org.sakaiproject.kernel2.osgi.guiceuser.api.InterfaceD;
-import org.sakaiproject.kernel2.osgi.guiceuser.api.InterfaceE;
-import org.sakaiproject.kernel2.osgi.guiceuser.impl.ConcreteA;
-import org.sakaiproject.kernel2.osgi.guiceuser.impl.ConcreteB;
-import org.sakaiproject.kernel2.osgi.guiceuser.impl.ConcreteD;
-import org.sakaiproject.kernel2.osgi.guiceuser.impl.ConcreteE;
-import org.sakaiproject.kernel2.osgi.guiceuser.impl.FProvider;
-
-public class TestModule extends AbstractModule {
-
- @Override
- protected void configure() {
- bind(InterfaceA.class).to(ConcreteA.class).in(Scopes.SINGLETON);
- bind(InterfaceB.class).to(ConcreteB.class).in(Scopes.SINGLETON);
- bind(InterfaceD.class).to(ConcreteD.class).in(Scopes.SINGLETON);
- bind(InterfaceE.class).to(ConcreteE.class).in(Scopes.SINGLETON);
- bind(FProvider.class);
- }
-
-}
View
15 ...osgikernel/bundles/guiceuser/src/main/java/org/sakaiproject/kernel2/osgi/guiceuser/impl/InjectableC.java
@@ -1,15 +0,0 @@
-package org.sakaiproject.kernel2.osgi.guiceuser.impl;
-
-import com.google.inject.Inject;
-
-import org.sakaiproject.kernel2.osgi.guiceuser.api.InterfaceA;
-import org.sakaiproject.kernel2.osgi.guiceuser.api.InterfaceB;
-
-public class InjectableC {
-
- @Inject
- public InjectableC(InterfaceA a, InterfaceB b)
- {
- b.printString(a.getHelloWorld());
- }
-}
View
2  slingtests/osgikernel/bundles/jaxb/pom.xml
@@ -13,7 +13,7 @@
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.sakaiproject.kernel2.osgi</groupId>
+ <groupId>org.sakaiproject.kernel</groupId>
<artifactId>base</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
View
4 slingtests/osgikernel/bundles/jaxp-api/pom.xml
@@ -13,11 +13,11 @@
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.sakaiproject.kernel2.osgi</groupId>
+ <groupId>org.sakaiproject.kernel</groupId>
<artifactId>base</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
- <artifactId>org.sakaiproject.kernel2.osgi.jaxp-api</artifactId>
+ <artifactId>org.sakaiproject.kernel.jaxp-api</artifactId>
<packaging>bundle</packaging>
<version>1.3.0</version>
<name>JAXP API Bundle</name>
View
4 slingtests/osgikernel/bundles/jaxrs/pom.xml
@@ -13,11 +13,11 @@
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.sakaiproject.kernel2.osgi</groupId>
+ <groupId>org.sakaiproject.kernel</groupId>
<artifactId>base</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
- <artifactId>org.sakaiproject.kernel2.osgi.jaxrs</artifactId>
+ <artifactId>org.sakaiproject.kernel.jaxrs</artifactId>
<packaging>bundle</packaging>
<version>0.1-SNAPSHOT</version>
<name>JAX-RS 311 Bundle</name>
View
12 slingtests/osgikernel/bundles/jcr/pom.xml
@@ -13,11 +13,11 @@
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.sakaiproject.kernel2.osgi</groupId>
+ <groupId>org.sakaiproject.kernel</groupId>
<artifactId>base</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
- <artifactId>org.sakaiproject.kernel2.osgi.jcr</artifactId>
+ <artifactId>org.sakaiproject.kernel.jcr</artifactId>
<packaging>bundle</packaging>
<version>0.1-SNAPSHOT</version>
<name>Sakai Session Manager Bundle</name>
@@ -66,13 +66,13 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.session</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.session</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.locking</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.locking</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
View
4 slingtests/osgikernel/bundles/jetty-config/pom.xml
@@ -13,11 +13,11 @@
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.sakaiproject.kernel2.osgi</groupId>
+ <groupId>org.sakaiproject.kernel</groupId>
<artifactId>base</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
- <artifactId>org.sakaiproject.kernel2.osgi.jetty-config</artifactId>
+ <artifactId>org.sakaiproject.kernel.jetty-config</artifactId>
<packaging>jar</packaging>
<version>0.1-SNAPSHOT</version>
<name>Jetty Configuration</name>
View
2  slingtests/osgikernel/bundles/jpa/pom.xml
@@ -13,7 +13,7 @@
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.sakaiproject.kernel2.osgi</groupId>
+ <groupId>org.sakaiproject.kernel</groupId>
<artifactId>base</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
View
2  slingtests/osgikernel/bundles/jpacore/pom.xml
@@ -13,7 +13,7 @@
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.sakaiproject.kernel2.osgi</groupId>
+ <groupId>org.sakaiproject.kernel</groupId>
<artifactId>base</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
View
22 slingtests/osgikernel/bundles/jpaexample/pom.xml
@@ -12,11 +12,11 @@
<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.sakaiproject.kernel2.osgi</groupId>
+ <groupId>org.sakaiproject.kernel</groupId>
<artifactId>base</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
- <artifactId>org.sakaiproject.kernel2.osgi.jpaexample</artifactId>
+ <artifactId>org.sakaiproject.kernel.jpaexample</artifactId>
<packaging>bundle</packaging>
<version>0.1-SNAPSHOT</version>
<name>Sakai JPA User Bundle</name>
@@ -33,7 +33,7 @@
<configuration>
<instructions>
<Bundle-Category> sakai-kernel </Bundle-Category>
- <Bundle-Activator>org.sakaiproject.kernel2.osgi.jpaexample.Activator</Bundle-Activator>
+ <Bundle-Activator>org.sakaiproject.kernel.jpaexample.Activator</Bundle-Activator>
<Import-Package> *,com.google.inject.cglib.reflect </Import-Package>
<Sakai-JPA-PersistenceUnits>default</Sakai-JPA-PersistenceUnits>
</instructions>
@@ -55,23 +55,23 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.db</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.persistence</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.registry</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.registry</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.utils</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.utils</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.guice</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.guice</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
View
2  ...kaiproject/kernel2/osgi/jpaexample/Activator.java → ...org/sakaiproject/kernel/jpaexample/Activator.java
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.osgi.jpaexample;
+package org.sakaiproject.kernel.jpaexample;
import org.osgi.framework.BundleContext;
View
2  ...ject/kernel2/osgi/jpaexample/ActivatorModule.java → ...kaiproject/kernel/jpaexample/ActivatorModule.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.osgi.jpaexample;
+package org.sakaiproject.kernel.jpaexample;
import com.google.inject.Scopes;
View
4 ...aiproject/kernel2/osgi/jpaexample/JpaExample.java → ...rg/sakaiproject/kernel/jpaexample/JpaExample.java
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.osgi.jpaexample;
+package org.sakaiproject.kernel.jpaexample;
import com.google.inject.Inject;
-import org.sakaiproject.kernel2.osgi.jpaexample.jpa.model.ExampleModel;
+import org.sakaiproject.kernel.jpaexample.jpa.model.ExampleModel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
View
2  ...rnel2/osgi/jpaexample/jpa/model/ExampleModel.java → ...ect/kernel/jpaexample/jpa/model/ExampleModel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.osgi.jpaexample.jpa.model;
+package org.sakaiproject.kernel.jpaexample.jpa.model;
import java.io.Serializable;
View
2  slingtests/osgikernel/bundles/jpaexample/src/main/resources/META-INF/orm.xml
@@ -3,6 +3,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"
version="1.0">
- <entity class="org.sakaiproject.kernel2.osgi.jpaexample.jpa.model.ExampleModel">
+ <entity class="org.sakaiproject.kernel.jpaexample.jpa.model.ExampleModel">
</entity>
</entity-mappings>
View
2  slingtests/osgikernel/bundles/jpaexample/src/main/resources/META-INF/persistence.xml
@@ -3,6 +3,6 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
version="1.0" xmlns="http://java.sun.com/xml/ns/persistence">
<persistence-unit name="default">
- <class>org.sakaiproject.kernel2.osgi.jpaexample.jpa.model.ExampleModel</class>
+ <class>org.sakaiproject.kernel.jpaexample.jpa.model.ExampleModel</class>
</persistence-unit>
</persistence>
View
6 slingtests/osgikernel/bundles/jpahelloworld/pom.xml
@@ -12,11 +12,11 @@
<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.sakaiproject.kernel2.osgi</groupId>
+ <groupId>org.sakaiproject.kernel</groupId>
<artifactId>base</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
- <artifactId>org.sakaiproject.kernel2.osgi.jpahelloworld</artifactId>
+ <artifactId>org.sakaiproject.kernel.jpahelloworld</artifactId>
<packaging>bundle</packaging>
<version>0.1-SNAPSHOT</version>
<name>Sakai JPA Mysql Hello World</name>
@@ -33,7 +33,7 @@
<configuration>
<instructions>
<Bundle-Category> sakai-kernel </Bundle-Category>
- <Bundle-Activator>org.sakaiproject.kernel2.osgi.jpahelloworld.model.Hello</Bundle-Activator>
+ <Bundle-Activator>org.sakaiproject.kernel.jpahelloworld.model.Hello</Bundle-Activator>
<Import-Package>sun.io;resolution:=optional,
javax.xml.parsers,
org.w3c.dom,
View
2  ...ct/kernel2/osgi/jpahelloworld/model/Greeting.java → ...iproject/kernel/jpahelloworld/model/Greeting.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.osgi.jpahelloworld.model;
+package org.sakaiproject.kernel.jpahelloworld.model;
import java.io.Serializable;
import javax.persistence.Basic;
View
2  ...oject/kernel2/osgi/jpahelloworld/model/Hello.java → ...akaiproject/kernel/jpahelloworld/model/Hello.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.osgi.jpahelloworld.model;
+package org.sakaiproject.kernel.jpahelloworld.model;
import org.eclipse.persistence.config.PersistenceUnitProperties;
import org.eclipse.persistence.jpa.osgi.PersistenceProvider;
View
2  slingtests/osgikernel/bundles/jpahelloworld/src/main/resources/META-INF/orm.xml
@@ -3,6 +3,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"
version="1.0">
- <entity class="org.sakaiproject.kernel2.osgi.jpahelloworld.model.Greeting">
+ <entity class="org.sakaiproject.kernel.jpahelloworld.model.Greeting">
</entity>
</entity-mappings>
View
2  slingtests/osgikernel/bundles/jpahelloworld/src/main/resources/META-INF/persistence.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<persistence version="1.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
<persistence-unit name="greetingPU">
-<class>org.sakaiproject.kernel2.osgi.jpahelloworld.model.Greeting</class>
+<class>org.sakaiproject.kernel.jpahelloworld.model.Greeting</class>
<properties>
<property name="eclipselink.jdbc.driver" value="org.apache.derby.jdbc.EmbeddedDriver"/>
<property name="eclipselink.jdbc.url" value="jdbc:derby:testdb;create=true"/>
View
6 slingtests/osgikernel/bundles/jpaprovider/pom.xml
@@ -12,11 +12,11 @@
<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.sakaiproject.kernel2.osgi</groupId>
+ <groupId>org.sakaiproject.kernel</groupId>
<artifactId>base</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
- <artifactId>org.sakaiproject.kernel2.osgi.jpaprovider</artifactId>
+ <artifactId>org.sakaiproject.kernel.jpaprovider</artifactId>
<packaging>bundle</packaging>
<version>0.1-SNAPSHOT</version>
<name>Sakai JPA Mysql Provider</name>
@@ -33,7 +33,7 @@
<configuration>
<instructions>
<Bundle-Category> sakai-kernel </Bundle-Category>
- <Bundle-Activator>org.sakaiproject.kernel2.osgi.jpaprovider.PersistenceBundleMonitor</Bundle-Activator>
+ <Bundle-Activator>org.sakaiproject.kernel.jpaprovider.PersistenceBundleMonitor</Bundle-Activator>
<Sakai-JPA-PersistenceUnits>default</Sakai-JPA-PersistenceUnits>
<Import-Package>sun.io;resolution:=optional,
sun.misc;resolution:=optional,
View
12 ...el2/osgi/jpaprovider/AmalgamatingClassloader.java → ...t/kernel/jpaprovider/AmalgamatingClassloader.java
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.osgi.jpaprovider;
+package org.sakaiproject.kernel.jpaprovider;
import com.thoughtworks.xstream.XStream;
-import org.sakaiproject.kernel2.osgi.jpaprovider.xstream.OrmEntity;
-import org.sakaiproject.kernel2.osgi.jpaprovider.xstream.OrmSettings;
-import org.sakaiproject.kernel2.osgi.jpaprovider.xstream.PersistenceSettings;
-import org.sakaiproject.kernel2.osgi.jpaprovider.xstream.PersistenceUnit;
-import org.sakaiproject.kernel2.osgi.jpaprovider.xstream.XStreamWritable;
+import org.sakaiproject.kernel.jpaprovider.xstream.OrmEntity;
+import org.sakaiproject.kernel.jpaprovider.xstream.OrmSettings;
+import org.sakaiproject.kernel.jpaprovider.xstream.PersistenceSettings;
+import org.sakaiproject.kernel.jpaprovider.xstream.PersistenceUnit;
+import org.sakaiproject.kernel.jpaprovider.xstream.XStreamWritable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
View
2  ...gi/jpaprovider/BundleGatheringResourceFinder.java → ...el/jpaprovider/BundleGatheringResourceFinder.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.osgi.jpaprovider;
+package org.sakaiproject.kernel.jpaprovider;
import org.osgi.framework.Bundle;
import org.slf4j.Logger;
View
2  ...l2/osgi/jpaprovider/PersistenceBundleMonitor.java → .../kernel/jpaprovider/PersistenceBundleMonitor.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.osgi.jpaprovider;
+package org.sakaiproject.kernel.jpaprovider;
import org.eclipse.persistence.internal.jpa.deployment.osgi.BundleProxyClassLoader;
import org.eclipse.persistence.logging.AbstractSessionLog;
View
2  ...rovider/SakaiPersistenceInitializationHelper.java → ...rovider/SakaiPersistenceInitializationHelper.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.osgi.jpaprovider;
+package org.sakaiproject.kernel.jpaprovider;
import org.eclipse.persistence.config.PersistenceUnitProperties;
import org.eclipse.persistence.internal.jpa.deployment.PersistenceInitializationHelper;
View
2  ...l2/osgi/jpaprovider/SakaiPersistenceProvider.java → .../kernel/jpaprovider/SakaiPersistenceProvider.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.osgi.jpaprovider;
+package org.sakaiproject.kernel.jpaprovider;
import org.eclipse.persistence.config.PersistenceUnitProperties;
import org.eclipse.persistence.jpa.PersistenceProvider;
View
4 ...ject/kernel2/osgi/jpaprovider/UrlEnumeration.java → ...kaiproject/kernel/jpaprovider/UrlEnumeration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.osgi.jpaprovider;
+package org.sakaiproject.kernel.jpaprovider;
import java.net.URL;
import java.util.Enumeration;
@@ -25,7 +25,7 @@
private URL url;
- UrlEnumeration(URL url) {
+ public UrlEnumeration(URL url) {
this.url = url;
}
View
2  .../kernel2/osgi/jpaprovider/UserManagerFactory.java → ...roject/kernel/jpaprovider/UserManagerFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.osgi.jpaprovider;
+package org.sakaiproject.kernel.jpaprovider;
import java.util.HashMap;
import java.util.Map;
View
2  ...ct/kernel2/osgi/jpaprovider/model/SystemUser.java → ...iproject/kernel/jpaprovider/model/SystemUser.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.osgi.jpaprovider.model;
+package org.sakaiproject.kernel.jpaprovider.model;
import java.io.Serializable;
View
2  ...el2/osgi/jpaprovider/xstream/EntityConverter.java → ...t/kernel/jpaprovider/xstream/EntityConverter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.osgi.jpaprovider.xstream;
+package org.sakaiproject.kernel.jpaprovider.xstream;
import com.thoughtworks.xstream.converters.Converter;
import com.thoughtworks.xstream.converters.MarshallingContext;
View
2  ...t/kernel2/osgi/jpaprovider/xstream/OrmEntity.java → ...project/kernel/jpaprovider/xstream/OrmEntity.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.osgi.jpaprovider.xstream;
+package org.sakaiproject.kernel.jpaprovider.xstream;
import com.thoughtworks.xstream.annotations.XStreamAlias;
View
2  ...kernel2/osgi/jpaprovider/xstream/OrmSettings.java → ...oject/kernel/jpaprovider/xstream/OrmSettings.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.osgi.jpaprovider.xstream;
+package org.sakaiproject.kernel.jpaprovider.xstream;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.annotations.XStreamAlias;
View
2  ...osgi/jpaprovider/xstream/PersistenceSettings.java → ...rnel/jpaprovider/xstream/PersistenceSettings.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.osgi.jpaprovider.xstream;
+package org.sakaiproject.kernel.jpaprovider.xstream;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.annotations.XStreamAlias;
View
2  ...el2/osgi/jpaprovider/xstream/PersistenceUnit.java → ...t/kernel/jpaprovider/xstream/PersistenceUnit.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.osgi.jpaprovider.xstream;
+package org.sakaiproject.kernel.jpaprovider.xstream;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamImplicit;
View
2  ...ct/kernel2/osgi/jpaprovider/xstream/Property.java → ...iproject/kernel/jpaprovider/xstream/Property.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.osgi.jpaprovider.xstream;
+package org.sakaiproject.kernel.jpaprovider.xstream;
import com.thoughtworks.xstream.annotations.XStreamAlias;
View
2  ...2/osgi/jpaprovider/xstream/PropertyConverter.java → ...kernel/jpaprovider/xstream/PropertyConverter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.osgi.jpaprovider.xstream;
+package org.sakaiproject.kernel.jpaprovider.xstream;
import com.thoughtworks.xstream.converters.Converter;
import com.thoughtworks.xstream.converters.MarshallingContext;
View
2  ...el2/osgi/jpaprovider/xstream/XStreamWritable.java → ...t/kernel/jpaprovider/xstream/XStreamWritable.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.osgi.jpaprovider.xstream;
+package org.sakaiproject.kernel.jpaprovider.xstream;
import com.thoughtworks.xstream.XStream;
View
2  slingtests/osgikernel/bundles/jpaprovider/src/main/resources/META-INF/kernel-orm.xml
@@ -3,6 +3,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"
version="1.0">
- <entity class="org.sakaiproject.kernel2.osgi.jpaprovider.model.SystemUser">
+ <entity class="org.sakaiproject.kernel.jpaprovider.model.SystemUser">
</entity>
</entity-mappings>
View
2  slingtests/osgikernel/bundles/jpaprovider/src/main/resources/META-INF/kernel-persistence.xml
@@ -2,7 +2,7 @@
<persistence version="1.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
<persistence-unit name="default" transaction-type="RESOURCE_LOCAL">
- <class>org.sakaiproject.kernel2.osgi.jpaprovider.model.SystemUser</class>
+ <class>org.sakaiproject.kernel.jpaprovider.model.SystemUser</class>
<properties>
<property name="eclipselink.jdbc.driver" value="org.apache.derby.jdbc.EmbeddedDriver"/>
<property name="eclipselink.jdbc.url" value="jdbc:derby:testdb;create=true"/>
View
3  ...project/kernel2/osgi/jpaprovider/DummyBundle.java → ...iproject/kernel/jpaprovider/test/DummyBundle.java
@@ -16,12 +16,13 @@
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.osgi.jpaprovider;
+package org.sakaiproject.kernel.jpaprovider.test;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
import org.osgi.framework.ServiceReference;
+import org.sakaiproject.kernel.jpaprovider.UrlEnumeration;
import java.io.IOException;
import java.io.InputStream;
View
2  .../kernel2/osgi/jpaprovider/DummyBundleContext.java → ...t/kernel/jpaprovider/test/DummyBundleContext.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.osgi.jpaprovider;
+package org.sakaiproject.kernel.jpaprovider.test;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
View
6 ...ject/kernel2/osgi/jpaprovider/DummyJpaBundle.java → ...oject/kernel/jpaprovider/test/DummyJpaBundle.java
@@ -16,9 +16,11 @@
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.osgi.jpaprovider;
+package org.sakaiproject.kernel.jpaprovider.test;
-import org.sakaiproject.kernel2.osgi.jpaprovider.xstream.PersistenceSettings;
+import org.sakaiproject.kernel.jpaprovider.AmalgamatingClassloader;
+import org.sakaiproject.kernel.jpaprovider.PersistenceBundleMonitor;
+import org.sakaiproject.kernel.jpaprovider.xstream.PersistenceSettings;
import java.io.IOException;
import java.net.URL;
View
14 ...project/kernel2/osgi/jpaprovider/TestMerging.java → ...iproject/kernel/jpaprovider/test/TestMerging.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.osgi.jpaprovider;
+package org.sakaiproject.kernel.jpaprovider.test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -25,11 +25,13 @@
import org.junit.Test;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleEvent;
-import org.sakaiproject.kernel2.osgi.jpaprovider.xstream.OrmEntity;
-import org.sakaiproject.kernel2.osgi.jpaprovider.xstream.OrmSettings;
-import org.sakaiproject.kernel2.osgi.jpaprovider.xstream.PersistenceSettings;
-import org.sakaiproject.kernel2.osgi.jpaprovider.xstream.PersistenceUnit;
-import org.sakaiproject.kernel2.osgi.jpaprovider.xstream.Property;
+import org.sakaiproject.kernel.jpaprovider.AmalgamatingClassloader;
+import org.sakaiproject.kernel.jpaprovider.PersistenceBundleMonitor;
+import org.sakaiproject.kernel.jpaprovider.xstream.OrmEntity;
+import org.sakaiproject.kernel.jpaprovider.xstream.OrmSettings;
+import org.sakaiproject.kernel.jpaprovider.xstream.PersistenceSettings;
+import org.sakaiproject.kernel.jpaprovider.xstream.PersistenceUnit;
+import org.sakaiproject.kernel.jpaprovider.xstream.Property;
import java.io.IOException;
import java.util.ArrayList;
View
14 ...project/kernel2/osgi/jpaprovider/TestParsing.java → ...iproject/kernel/jpaprovider/test/TestParsing.java
@@ -16,17 +16,17 @@
* specific language governing permissions and limitations under the License.
*/
-package org.sakaiproject.kernel2.osgi.jpaprovider;
+package org.sakaiproject.kernel.jpaprovider.test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import org.junit.Test;
-import org.sakaiproject.kernel2.osgi.jpaprovider.xstream.OrmEntity;
-import org.sakaiproject.kernel2.osgi.jpaprovider.xstream.OrmSettings;
-import org.sakaiproject.kernel2.osgi.jpaprovider.xstream.PersistenceSettings;
-import org.sakaiproject.kernel2.osgi.jpaprovider.xstream.PersistenceUnit;
-import org.sakaiproject.kernel2.osgi.jpaprovider.xstream.XStreamWritable;
+import org.sakaiproject.kernel.jpaprovider.xstream.OrmEntity;
+import org.sakaiproject.kernel.jpaprovider.xstream.OrmSettings;
+import org.sakaiproject.kernel.jpaprovider.xstream.PersistenceSettings;
+import org.sakaiproject.kernel.jpaprovider.xstream.PersistenceUnit;
+import org.sakaiproject.kernel.jpaprovider.xstream.XStreamWritable;
import java.util.List;
import java.util.Map;
@@ -63,7 +63,7 @@ public void testOrmXmlParse() {
List<OrmEntity> entities = settings.getEntities();
assertEquals("Expected there to be two entities", 2, entities.size());
assertEquals("Expected class value to be recorded",
- "org.sakaiproject.kernel2.osgi.jpaprovider.model.SystemUser", entities.get(0)
+ "org.sakaiproject.kernel.jpaprovider.model.SystemUser", entities.get(0)
.getClassName());
}
}
View
4 slingtests/osgikernel/bundles/jpaprovider/src/test/resources/orm1.xml
@@ -3,6 +3,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"
version="1.0">
- <entity class="org.sakaiproject.kernel2.osgi.jpaprovider.model.SystemUser"/>
- <entity class="org.sakaiproject.kernel2.osgi.jpaprovider.model.SystemUser2"/>
+ <entity class="org.sakaiproject.kernel.jpaprovider.model.SystemUser"/>
+ <entity class="org.sakaiproject.kernel.jpaprovider.model.SystemUser2"/>
</entity-mappings>
View
4 slingtests/osgikernel/bundles/jpaprovider/src/test/resources/orm2.xml
@@ -3,6 +3,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"
version="1.0">
- <entity class="org.sakaiproject.kernel2.osgi.jpaprovider.model.SystemUser3"/>
- <entity class="org.sakaiproject.kernel2.osgi.jpaprovider.model.SystemUser4"/>
+ <entity class="org.sakaiproject.kernel.jpaprovider.model.SystemUser3"/>
+ <entity class="org.sakaiproject.kernel.jpaprovider.model.SystemUser4"/>
</entity-mappings>
View
4 slingtests/osgikernel/bundles/jpaprovider/src/test/resources/persistence1.xml
@@ -3,8 +3,8 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
version="1.0" xmlns="http://java.sun.com/xml/ns/persistence">
<persistence-unit name="default">
- <class>org.sakaiproject.kernel2.osgi.jpaprovider.model.SystemUser</class>
- <class>org.sakaiproject.kernel2.osgi.jpaprovider.model.SystemUser2</class>
+ <class>org.sakaiproject.kernel.jpaprovider.model.SystemUser</class>
+ <class>org.sakaiproject.kernel.jpaprovider.model.SystemUser2</class>
<properties>
<property name="testproperty" value="testvalue"/>
</properties>
View
4 slingtests/osgikernel/bundles/jpaprovider/src/test/resources/persistence2.xml
@@ -3,8 +3,8 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
version="1.0" xmlns="http://java.sun.com/xml/ns/persistence">
<persistence-unit name="default">
- <class>org.sakaiproject.kernel2.osgi.jpaprovider.model.SystemUser3</class>
- <class>org.sakaiproject.kernel2.osgi.jpaprovider.model.SystemUser4</class>
+ <class>org.sakaiproject.kernel.jpaprovider.model.SystemUser3</class>
+ <class>org.sakaiproject.kernel.jpaprovider.model.SystemUser4</class>
<properties>
<property name="testproperty2" value="testvalue2"/>
</properties>
View
2  slingtests/osgikernel/bundles/jsr173/pom.xml
@@ -13,7 +13,7 @@
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.sakaiproject.kernel2.osgi</groupId>
+ <groupId>org.sakaiproject.kernel</groupId>
<artifactId>base</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
View
4 slingtests/osgikernel/bundles/kernel/pom.xml
@@ -13,11 +13,11 @@
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.sakaiproject.kernel2.osgi</groupId>
+ <groupId>org.sakaiproject.kernel</groupId>
<artifactId>base</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
- <artifactId>org.sakaiproject.kernel2.osgi.kernel</artifactId>
+ <artifactId>org.sakaiproject.kernel.configuration</artifactId>
<packaging>bundle</packaging>
<version>0.1-SNAPSHOT</version>
<name>Sakai Kernel Bundle</name>
View
16 slingtests/osgikernel/bundles/lifecycle/pom.xml
@@ -13,11 +13,11 @@
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.sakaiproject.kernel2.osgi</groupId>
+ <groupId>org.sakaiproject.kernel</groupId>
<artifactId>base</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
- <artifactId>org.sakaiproject.kernel2.osgi.lifecycle</artifactId>
+ <artifactId>org.sakaiproject.kernel.lifecycle</artifactId>
<packaging>bundle</packaging>
<version>0.1-SNAPSHOT</version>
<name>Sakai Kernel Initialization Bundle</name>
@@ -60,20 +60,20 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.utils</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.utils</artifactId>
<version>0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.registry</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.registry</artifactId>
<version>0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.guice</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.guice</artifactId>
<version>0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
View
8 slingtests/osgikernel/bundles/locking/pom.xml
@@ -13,11 +13,11 @@
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.sakaiproject.kernel2.osgi</groupId>
+ <groupId>org.sakaiproject.kernel</groupId>
<artifactId>base</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
- <artifactId>org.sakaiproject.kernel2.osgi.locking</artifactId>
+ <artifactId>org.sakaiproject.kernel.locking</artifactId>
<packaging>bundle</packaging>
<version>0.1-SNAPSHOT</version>
<name>Sakai Session Manager Bundle</name>
@@ -66,8 +66,8 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.sakaiproject.kernel2.osgi</groupId>
- <artifactId>org.sakaiproject.kernel2.osgi.session</artifactId>
+ <groupId>org.sakaiproject.kernel</groupId>
+ <artifactId>org.sakaiproject.kernel.session</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
View
8 slingtests/osgikernel/bundles/memory/pom.xml
@@ -13,11 +13,11 @@
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.sakaiproject.kernel2.osgi</groupId>