You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by jb...@apache.org on 2010/10/13 22:36:28 UTC
svn commit: r1022285 [1/2] - in
/incubator/aries/sandbox/jbohn/interceptor-proto: application/
application/application-default-local-platform/
application/application-default-local-platform/src/
application/application-default-local-platform/src/main/ ...
Author: jbohn
Date: Wed Oct 13 20:36:24 2010
New Revision: 1022285
URL: http://svn.apache.org/viewvc?rev=1022285&view=rev
Log:
merge from trunk 1022017:1022212
Added:
incubator/aries/sandbox/jbohn/interceptor-proto/application/application-default-local-platform/ (props changed)
- copied from r1022212, incubator/aries/trunk/application/application-default-local-platform/
incubator/aries/sandbox/jbohn/interceptor-proto/application/application-default-local-platform/pom.xml
- copied unchanged from r1022212, incubator/aries/trunk/application/application-default-local-platform/pom.xml
incubator/aries/sandbox/jbohn/interceptor-proto/application/application-default-local-platform/src/
- copied from r1022212, incubator/aries/trunk/application/application-default-local-platform/src/
incubator/aries/sandbox/jbohn/interceptor-proto/application/application-default-local-platform/src/main/
- copied from r1022212, incubator/aries/trunk/application/application-default-local-platform/src/main/
incubator/aries/sandbox/jbohn/interceptor-proto/application/application-default-local-platform/src/main/java/
- copied from r1022212, incubator/aries/trunk/application/application-default-local-platform/src/main/java/
incubator/aries/sandbox/jbohn/interceptor-proto/application/application-default-local-platform/src/main/java/org/
- copied from r1022212, incubator/aries/trunk/application/application-default-local-platform/src/main/java/org/
incubator/aries/sandbox/jbohn/interceptor-proto/application/application-default-local-platform/src/main/java/org/apache/
- copied from r1022212, incubator/aries/trunk/application/application-default-local-platform/src/main/java/org/apache/
incubator/aries/sandbox/jbohn/interceptor-proto/application/application-default-local-platform/src/main/java/org/apache/aries/
- copied from r1022212, incubator/aries/trunk/application/application-default-local-platform/src/main/java/org/apache/aries/
incubator/aries/sandbox/jbohn/interceptor-proto/application/application-default-local-platform/src/main/java/org/apache/aries/application/
- copied from r1022212, incubator/aries/trunk/application/application-default-local-platform/src/main/java/org/apache/aries/application/
incubator/aries/sandbox/jbohn/interceptor-proto/application/application-default-local-platform/src/main/java/org/apache/aries/application/local/
- copied from r1022212, incubator/aries/trunk/application/application-default-local-platform/src/main/java/org/apache/aries/application/local/
incubator/aries/sandbox/jbohn/interceptor-proto/application/application-default-local-platform/src/main/java/org/apache/aries/application/local/platform/
- copied from r1022212, incubator/aries/trunk/application/application-default-local-platform/src/main/java/org/apache/aries/application/local/platform/
incubator/aries/sandbox/jbohn/interceptor-proto/application/application-default-local-platform/src/main/java/org/apache/aries/application/local/platform/impl/
- copied from r1022212, incubator/aries/trunk/application/application-default-local-platform/src/main/java/org/apache/aries/application/local/platform/impl/
incubator/aries/sandbox/jbohn/interceptor-proto/application/application-default-local-platform/src/main/java/org/apache/aries/application/local/platform/impl/DefaultLocalPlatform.java
- copied unchanged from r1022212, incubator/aries/trunk/application/application-default-local-platform/src/main/java/org/apache/aries/application/local/platform/impl/DefaultLocalPlatform.java
incubator/aries/sandbox/jbohn/interceptor-proto/application/application-default-local-platform/src/main/resources/
- copied from r1022212, incubator/aries/trunk/application/application-default-local-platform/src/main/resources/
incubator/aries/sandbox/jbohn/interceptor-proto/application/application-default-local-platform/src/main/resources/OSGI-INF/
- copied from r1022212, incubator/aries/trunk/application/application-default-local-platform/src/main/resources/OSGI-INF/
incubator/aries/sandbox/jbohn/interceptor-proto/application/application-default-local-platform/src/main/resources/OSGI-INF/blueprint/
- copied from r1022212, incubator/aries/trunk/application/application-default-local-platform/src/main/resources/OSGI-INF/blueprint/
incubator/aries/sandbox/jbohn/interceptor-proto/application/application-default-local-platform/src/main/resources/OSGI-INF/blueprint/default-local-platform.xml
- copied unchanged from r1022212, incubator/aries/trunk/application/application-default-local-platform/src/main/resources/OSGI-INF/blueprint/default-local-platform.xml
incubator/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container/src/test/resources/file23/
- copied from r1022212, incubator/aries/trunk/jpa/jpa-container/src/test/resources/file23/
incubator/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container/src/test/resources/file23/META-INF/
- copied from r1022212, incubator/aries/trunk/jpa/jpa-container/src/test/resources/file23/META-INF/
incubator/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container/src/test/resources/file23/META-INF/persistence.xml
- copied unchanged from r1022212, incubator/aries/trunk/jpa/jpa-container/src/test/resources/file23/META-INF/persistence.xml
incubator/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container/src/test/resources/file23/WEB-INF/
- copied from r1022212, incubator/aries/trunk/jpa/jpa-container/src/test/resources/file23/WEB-INF/
incubator/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container/src/test/resources/file23/WEB-INF/META-INF/
- copied from r1022212, incubator/aries/trunk/jpa/jpa-container/src/test/resources/file23/WEB-INF/META-INF/
incubator/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container/src/test/resources/file23/WEB-INF/META-INF/persistence.xml
- copied unchanged from r1022212, incubator/aries/trunk/jpa/jpa-container/src/test/resources/file23/WEB-INF/META-INF/persistence.xml
incubator/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container/src/test/resources/file23/WEB-INF/classes/
- copied from r1022212, incubator/aries/trunk/jpa/jpa-container/src/test/resources/file23/WEB-INF/classes/
incubator/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container/src/test/resources/file23/WEB-INF/classes/notOnClasspath/
- copied from r1022212, incubator/aries/trunk/jpa/jpa-container/src/test/resources/file23/WEB-INF/classes/notOnClasspath/
incubator/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container/src/test/resources/file23/WEB-INF/classes/notOnClasspath/META-INF/
- copied from r1022212, incubator/aries/trunk/jpa/jpa-container/src/test/resources/file23/WEB-INF/classes/notOnClasspath/META-INF/
incubator/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container/src/test/resources/file23/WEB-INF/classes/notOnClasspath/META-INF/persistence.xml
- copied unchanged from r1022212, incubator/aries/trunk/jpa/jpa-container/src/test/resources/file23/WEB-INF/classes/notOnClasspath/META-INF/persistence.xml
incubator/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container/src/test/resources/file23/WEB-INF/classes/onClasspath/
- copied from r1022212, incubator/aries/trunk/jpa/jpa-container/src/test/resources/file23/WEB-INF/classes/onClasspath/
incubator/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container/src/test/resources/file23/WEB-INF/classes/onClasspath/META-INF/
- copied from r1022212, incubator/aries/trunk/jpa/jpa-container/src/test/resources/file23/WEB-INF/classes/onClasspath/META-INF/
incubator/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container/src/test/resources/file23/WEB-INF/classes/onClasspath/META-INF/persistence.xml
- copied unchanged from r1022212, incubator/aries/trunk/jpa/jpa-container/src/test/resources/file23/WEB-INF/classes/onClasspath/META-INF/persistence.xml
incubator/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container/src/test/resources/file23/WEB-INF/lib/
- copied from r1022212, incubator/aries/trunk/jpa/jpa-container/src/test/resources/file23/WEB-INF/lib/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-example/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-example/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-example/pom.xml
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-example/pom.xml
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-example/subsystem-helloIsolation/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-example/subsystem-helloIsolation/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-example/subsystem-helloIsolation/pom.xml
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-example/subsystem-helloIsolation/pom.xml
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-example/subsystem-helloIsolation/src/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-example/subsystem-helloIsolation/src/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-example/subsystem-helloIsolation/src/main/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-example/subsystem-helloIsolation/src/main/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-example/subsystem-helloIsolation/src/main/java/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-example/subsystem-helloIsolation/src/main/java/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-example/subsystem-helloIsolation/src/main/java/org/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-example/subsystem-helloIsolation/src/main/java/org/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-example/subsystem-helloIsolation/src/main/java/org/apache/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-example/subsystem-helloIsolation/src/main/java/org/apache/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-example/subsystem-helloIsolation/src/main/java/org/apache/aries/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-example/subsystem-helloIsolation/src/main/java/org/apache/aries/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-example/subsystem-helloIsolation/src/main/java/org/apache/aries/subsystem/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-example/subsystem-helloIsolation/src/main/java/org/apache/aries/subsystem/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-example/subsystem-helloIsolation/src/main/java/org/apache/aries/subsystem/example/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-example/subsystem-helloIsolation/src/main/java/org/apache/aries/subsystem/example/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-example/subsystem-helloIsolation/src/main/java/org/apache/aries/subsystem/example/helloIsolation/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-example/subsystem-helloIsolation/src/main/java/org/apache/aries/subsystem/example/helloIsolation/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-example/subsystem-helloIsolation/src/main/java/org/apache/aries/subsystem/example/helloIsolation/Activator.java
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-example/subsystem-helloIsolation/src/main/java/org/apache/aries/subsystem/example/helloIsolation/Activator.java
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-example/subsystem-helloIsolation/src/main/java/org/apache/aries/subsystem/example/helloIsolation/HelloIsolation.java
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-example/subsystem-helloIsolation/src/main/java/org/apache/aries/subsystem/example/helloIsolation/HelloIsolation.java
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-example/subsystem-helloIsolation/src/main/java/org/apache/aries/subsystem/example/helloIsolation/HelloIsolationImpl.java
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-example/subsystem-helloIsolation/src/main/java/org/apache/aries/subsystem/example/helloIsolation/HelloIsolationImpl.java
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-example/subsystem-helloIsolationRef/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-example/subsystem-helloIsolationRef/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-example/subsystem-helloIsolationRef/pom.xml
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-example/subsystem-helloIsolationRef/pom.xml
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-example/subsystem-helloIsolationRef/src/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-example/subsystem-helloIsolationRef/src/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-example/subsystem-helloIsolationRef/src/main/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-example/subsystem-helloIsolationRef/src/main/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-example/subsystem-helloIsolationRef/src/main/java/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-example/subsystem-helloIsolationRef/src/main/java/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-example/subsystem-helloIsolationRef/src/main/java/org/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-example/subsystem-helloIsolationRef/src/main/java/org/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-example/subsystem-helloIsolationRef/src/main/java/org/apache/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-example/subsystem-helloIsolationRef/src/main/java/org/apache/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-example/subsystem-helloIsolationRef/src/main/java/org/apache/aries/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-example/subsystem-helloIsolationRef/src/main/java/org/apache/aries/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-example/subsystem-helloIsolationRef/src/main/java/org/apache/aries/subsystem/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-example/subsystem-helloIsolationRef/src/main/java/org/apache/aries/subsystem/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-example/subsystem-helloIsolationRef/src/main/java/org/apache/aries/subsystem/example/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-example/subsystem-helloIsolationRef/src/main/java/org/apache/aries/subsystem/example/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-example/subsystem-helloIsolationRef/src/main/java/org/apache/aries/subsystem/example/helloIsolationRef/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-example/subsystem-helloIsolationRef/src/main/java/org/apache/aries/subsystem/example/helloIsolationRef/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-example/subsystem-helloIsolationRef/src/main/java/org/apache/aries/subsystem/example/helloIsolationRef/Activator.java
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-example/subsystem-helloIsolationRef/src/main/java/org/apache/aries/subsystem/example/helloIsolationRef/Activator.java
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-example/subsystem-helloIsolationRef/src/main/java/org/apache/aries/subsystem/example/helloIsolationRef/HelloIsolationRef.java
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-example/subsystem-helloIsolationRef/src/main/java/org/apache/aries/subsystem/example/helloIsolationRef/HelloIsolationRef.java
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-example/subsystem-helloIsolationRef/src/main/java/org/apache/aries/subsystem/example/helloIsolationRef/HelloIsolationRefImpl.java
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-example/subsystem-helloIsolationRef/src/main/java/org/apache/aries/subsystem/example/helloIsolationRef/HelloIsolationRefImpl.java
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-api/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-api/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-api/pom.xml
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-api/pom.xml
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-api/src/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-api/src/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-api/src/main/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-api/src/main/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-api/src/main/java/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-api/src/main/java/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-api/src/main/java/org/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-api/src/main/java/org/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-api/src/main/java/org/apache/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-api/src/main/java/org/apache/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-api/src/main/java/org/apache/aries/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-api/src/main/java/org/apache/aries/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-api/src/main/java/org/apache/aries/subsystem/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-api/src/main/java/org/apache/aries/subsystem/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-api/src/main/java/org/apache/aries/subsystem/scope/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-api/src/main/java/org/apache/aries/subsystem/scope/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-api/src/main/java/org/apache/aries/subsystem/scope/InstallInfo.java
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-api/src/main/java/org/apache/aries/subsystem/scope/InstallInfo.java
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-api/src/main/java/org/apache/aries/subsystem/scope/Scope.java
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-api/src/main/java/org/apache/aries/subsystem/scope/Scope.java
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-api/src/main/java/org/apache/aries/subsystem/scope/ScopeAdmin.java
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-api/src/main/java/org/apache/aries/subsystem/scope/ScopeAdmin.java
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-api/src/main/java/org/apache/aries/subsystem/scope/ScopeUpdate.java
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-api/src/main/java/org/apache/aries/subsystem/scope/ScopeUpdate.java
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-api/src/main/java/org/apache/aries/subsystem/scope/SharePolicy.java
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-api/src/main/java/org/apache/aries/subsystem/scope/SharePolicy.java
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-impl/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-impl/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-impl/pom.xml
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-impl/pom.xml
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-impl/src/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-impl/src/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-impl/src/main/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-impl/src/main/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-impl/src/main/java/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-impl/src/main/java/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-impl/src/main/java/org/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-impl/src/main/java/org/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-impl/src/main/java/org/apache/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-impl/src/main/java/org/apache/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-impl/src/main/java/org/apache/aries/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-impl/src/main/java/org/apache/aries/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-impl/src/main/java/org/apache/aries/subsystem/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-impl/src/main/java/org/apache/aries/subsystem/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-impl/src/main/java/org/apache/aries/subsystem/scope/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-impl/src/main/java/org/apache/aries/subsystem/scope/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-impl/src/main/java/org/apache/aries/subsystem/scope/impl/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-impl/src/main/java/org/apache/aries/subsystem/scope/impl/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-impl/src/main/java/org/apache/aries/subsystem/scope/impl/DictionaryBuilder.java
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-impl/src/main/java/org/apache/aries/subsystem/scope/impl/DictionaryBuilder.java
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-impl/src/main/java/org/apache/aries/subsystem/scope/impl/ScopeAdminImpl.java
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-impl/src/main/java/org/apache/aries/subsystem/scope/impl/ScopeAdminImpl.java
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-impl/src/main/java/org/apache/aries/subsystem/scope/impl/ScopeAdminServiceFactory.java
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-impl/src/main/java/org/apache/aries/subsystem/scope/impl/ScopeAdminServiceFactory.java
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-impl/src/main/java/org/apache/aries/subsystem/scope/impl/ScopeImpl.java
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-impl/src/main/java/org/apache/aries/subsystem/scope/impl/ScopeImpl.java
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-impl/src/main/java/org/apache/aries/subsystem/scope/impl/ScopeUpdateImpl.java
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-impl/src/main/java/org/apache/aries/subsystem/scope/impl/ScopeUpdateImpl.java
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-impl/src/main/java/org/apache/aries/subsystem/scope/internal/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-impl/src/main/java/org/apache/aries/subsystem/scope/internal/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-impl/src/main/java/org/apache/aries/subsystem/scope/internal/Activator.java
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-impl/src/main/java/org/apache/aries/subsystem/scope/internal/Activator.java
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-itests/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-itests/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-itests/README
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-itests/README
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-itests/pom.xml
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-itests/pom.xml
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-itests/src/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-itests/src/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-itests/src/test/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-itests/src/test/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-itests/src/test/java/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-itests/src/test/java/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-itests/src/test/java/org/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-itests/src/test/java/org/apache/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/apache/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/itests/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/itests/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/itests/AbstractIntegrationTest.java
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/itests/AbstractIntegrationTest.java
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/itests/JarCreator.java
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/itests/JarCreator.java
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/itests/ScopeAdminTest.java
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/itests/ScopeAdminTest.java
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-itests/src/test/java/org/ops4j/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/ops4j/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-itests/src/test/java/org/ops4j/pax/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/ops4j/pax/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-itests/src/test/java/org/ops4j/pax/runner/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/ops4j/pax/runner/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-itests/src/test/java/org/ops4j/pax/runner/platform/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/ops4j/pax/runner/platform/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-itests/src/test/resources/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-itests/src/test/resources/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-itests/src/test/resources/META-INF/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-itests/src/test/resources/META-INF/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-itests/src/test/resources/META-INF/platform-equinox/
- copied from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-itests/src/test/resources/META-INF/platform-equinox/
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-itests/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20100910.xml
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-itests/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20100910.xml
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-itests/src/test/resources/META-INF/platform-equinox/definition-V43PROTOTYPE-3.6.0.201003231329.xml
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-itests/src/test/resources/META-INF/platform-equinox/definition-V43PROTOTYPE-3.6.0.201003231329.xml
incubator/aries/sandbox/jbohn/interceptor-proto/subsystem/subsystem-scope-itests/src/test/resources/ss-runner.properties
- copied unchanged from r1022212, incubator/aries/trunk/subsystem/subsystem-scope-itests/src/test/resources/ss-runner.properties
Modified:
incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/pom.xml
incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/AbstractIntegrationTest.java
incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java
incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java
incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java
incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java
incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java
incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java
incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java
incubator/aries/sandbox/jbohn/interceptor-proto/application/application-utils/src/main/java/org/apache/aries/application/utils/runtime/DefaultLocalPlatform.java
incubator/aries/sandbox/jbohn/interceptor-proto/application/application-utils/src/main/resources/OSGI-INF/blueprint/app-utils.xml
incubator/aries/sandbox/jbohn/interceptor-proto/application/pom.xml
incubator/aries/sandbox/jbohn/interceptor-proto/jndi/jndi-core/pom.xml
incubator/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleHelper.java
incubator/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/PersistenceBundleLifecycleTest.java
incubator/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/equinox-test-harness/pom.xml
incubator/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
incubator/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-assembly/pom.xml
incubator/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini
incubator/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/pom.xml
incubator/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java
incubator/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java
incubator/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java
incubator/aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-assembly/pom.xml
incubator/aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-assembly/src/main/filtered-resources/configuration/config.ini
Propchange: incubator/aries/sandbox/jbohn/interceptor-proto/application/application-default-local-platform/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Oct 13 20:36:24 2010
@@ -0,0 +1,4 @@
+.settings
+target
+.classpath
+.project
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/pom.xml?rev=1022285&r1=1022284&r2=1022285&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/pom.xml (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/pom.xml Wed Oct 13 20:36:24 2010
@@ -170,6 +170,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.aries.application</groupId>
+ <artifactId>org.apache.aries.application.default.local.platform</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.aries.transaction</groupId>
<artifactId>org.apache.aries.transaction.blueprint</artifactId>
<version>0.3-incubating-SNAPSHOT</version>
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/AbstractIntegrationTest.java?rev=1022285&r1=1022284&r2=1022285&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/AbstractIntegrationTest.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/AbstractIntegrationTest.java Wed Oct 13 20:36:24 2010
@@ -16,7 +16,6 @@
*/
package org.apache.aries.application.runtime.itests;
-import static org.junit.Assert.assertNotNull;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
import static org.ops4j.pax.exam.OptionUtils.combine;
@@ -24,8 +23,6 @@ import static org.ops4j.pax.exam.OptionU
import java.util.ArrayList;
import java.util.List;
-import org.apache.aries.application.management.spi.resolve.AriesApplicationResolver;
-import org.apache.aries.blueprint.BlueprintConstants;
import org.junit.After;
import org.junit.Before;
import org.junit.runner.RunWith;
@@ -36,7 +33,6 @@ import org.ops4j.pax.exam.junit.JUnit4Te
import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
import org.osgi.framework.Constants;
import org.osgi.framework.Filter;
import org.osgi.framework.FrameworkUtil;
@@ -153,26 +149,5 @@ public class AbstractIntegrationTest {
throw new RuntimeException(e);
}
}
-
- /**
- * Checks if the OBR Resolver is available. If this test succeeds, it starts
- * the 'org.apache.aries.application.runtime' bundle. Of course this method
- * can only work properly if org.apache.aries.application.runtime was added
- * to Pax Exam configuration with 'noStart()'.
- * @throws BundleException
- */
- protected void startApplicationRuntimeBundle() throws BundleException{
- // Need to make sure that the OBR resolver was made available. This
- // resolver is registered by the org.apache.aries.application.resolver.obr
- // bundle with osgi.service.blueprint.compname=obr-resolver.
- getOsgiService(AriesApplicationResolver.class, "(" +
- BlueprintConstants.COMPONENT_NAME_PROPERTY + "=obr-resolver)",
- DEFAULT_TIMEOUT);
- // If we reached this point, initialization of the OBR resolver has been
- // finished. Let's start the org.apache.aries.application.runtime bundle.
- Bundle appRuntimeBundle = getBundle("org.apache.aries.application.runtime");
- assertNotNull(appRuntimeBundle);
- appRuntimeBundle.start();
- }
-
+
}
\ No newline at end of file
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java?rev=1022285&r1=1022284&r2=1022285&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java Wed Oct 13 20:36:24 2010
@@ -137,6 +137,7 @@ public class BasicAppManagerTest extends
mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.management"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime"),
+ mavenBundle("org.apache.aries.application", "org.apache.aries.application.default.local.platform"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.platform.repo"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.postresolve.process"),
mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java?rev=1022285&r1=1022284&r2=1022285&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java Wed Oct 13 20:36:24 2010
@@ -137,6 +137,7 @@ public class BasicNoOpResolverTest exten
mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.platform.repo"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.postresolve.process"),
+ mavenBundle("org.apache.aries.application", "org.apache.aries.application.default.local.platform"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.management"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.resolver.noop"),
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java?rev=1022285&r1=1022284&r2=1022285&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java Wed Oct 13 20:36:24 2010
@@ -247,6 +247,7 @@ public class IsolatedRuntimeTest extends
mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.platform.repo"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.postresolve.process"),
+ mavenBundle("org.apache.aries.application", "org.apache.aries.application.default.local.platform"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller"),
mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.resolver.obr"),
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java?rev=1022285&r1=1022284&r2=1022285&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java Wed Oct 13 20:36:24 2010
@@ -188,6 +188,7 @@ public class MinimumImportsTest extends
mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.platform.repo"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.postresolve.process"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime.itest.interfaces"),
+ mavenBundle("org.apache.aries.application", "org.apache.aries.application.default.local.platform"),
mavenBundle("org.apache.aries", "org.apache.aries.util"),
mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.resolver.obr"),
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java?rev=1022285&r1=1022284&r2=1022285&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java Wed Oct 13 20:36:24 2010
@@ -112,8 +112,7 @@ public class OBRAppManagerTest extends A
@Test
public void testAppWithApplicationManifest() throws Exception {
- startApplicationRuntimeBundle();
-
+
RepositoryAdmin repositoryAdmin = getOsgiService(RepositoryAdmin.class);
repositoryAdmin.addRepository(new File("repository.xml").toURI().toURL());
@@ -171,11 +170,12 @@ public class OBRAppManagerTest extends A
mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.platform.repo"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.postresolve.process"),
+ mavenBundle("org.apache.aries.application", "org.apache.aries.application.default.local.platform"),
mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.resolver.obr"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.deployment.management"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.management"),
- mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime").noStart(),
+ mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime.itest.interfaces"),
mavenBundle("org.osgi", "org.osgi.compendium"),
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java?rev=1022285&r1=1022284&r2=1022285&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java Wed Oct 13 20:36:24 2010
@@ -227,8 +227,6 @@ public class OBRResolverAdvancedTest ext
@Test(expected=ResolverException.class)
public void testDemoAppResolveFail() throws ResolverException, Exception
{
- startApplicationRuntimeBundle();
-
generateOBRRepoXML(false, TRANSITIVE_BUNDLE_BY_REFERENCE + ".jar", CORE_BUNDLE_BY_REFERENCE + "_0.0.0.jar", USE_BUNDLE_BY_REFERENCE+".jar");
RepositoryAdmin repositoryAdmin = getOsgiService(RepositoryAdmin.class);
@@ -251,8 +249,6 @@ public class OBRResolverAdvancedTest ext
@Test
public void testDemoApp() throws Exception
{
- startApplicationRuntimeBundle();
-
generateOBRRepoXML(false, TRANSITIVE_BUNDLE_BY_REFERENCE + ".jar", CORE_BUNDLE_BY_REFERENCE + ".jar", USE_BUNDLE_BY_REFERENCE+".jar");
RepositoryAdmin repositoryAdmin = getOsgiService(RepositoryAdmin.class);
@@ -328,7 +324,6 @@ public class OBRResolverAdvancedTest ext
*/
@Test
public void testRepo() throws Exception {
- startApplicationRuntimeBundle();
generateOBRRepoXML(true, REPO_BUNDLE+".jar");
//print out the repository.xml
BufferedReader reader = new BufferedReader(new FileReader(new File("repository.xml")));
@@ -369,7 +364,6 @@ public class OBRResolverAdvancedTest ext
@Test
public void testMutlipleServices() throws Exception{
- startApplicationRuntimeBundle();
generateOBRRepoXML(false, HELLO_WORLD_SERVICE_BUNDLE1 + ".jar", HELLO_WORLD_SERVICE_BUNDLE2 + ".jar");
RepositoryAdmin repositoryAdmin = getOsgiService(RepositoryAdmin.class);
@@ -459,9 +453,10 @@ public class OBRResolverAdvancedTest ext
mavenBundle("org.apache.aries.application", "org.apache.aries.application.api"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.management"),
+ mavenBundle("org.apache.aries.application", "org.apache.aries.application.default.local.platform"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.platform.repo"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.postresolve.process"),
- mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime").noStart(),
+ mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.resolver.obr"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.deployment.management"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller"),
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java?rev=1022285&r1=1022284&r2=1022285&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java Wed Oct 13 20:36:24 2010
@@ -148,8 +148,6 @@ public class OBRResolverTest extends Abs
@Test(expected=ResolverException.class)
public void testBlogAppResolveFail() throws ResolverException, Exception
{
- startApplicationRuntimeBundle();
-
generateOBRRepoXML(TRANSITIVE_BUNDLE_BY_REFERENCE + ".jar", CORE_BUNDLE_BY_REFERENCE + "_0.0.0.jar");
RepositoryAdmin repositoryAdmin = getOsgiService(RepositoryAdmin.class);
@@ -171,8 +169,6 @@ public class OBRResolverTest extends Abs
@Test
public void testBlogApp() throws Exception
{
- startApplicationRuntimeBundle();
-
generateOBRRepoXML(TRANSITIVE_BUNDLE_BY_REFERENCE + ".jar", CORE_BUNDLE_BY_REFERENCE + ".jar");
RepositoryAdmin repositoryAdmin = getOsgiService(RepositoryAdmin.class);
@@ -255,13 +251,14 @@ public class OBRResolverTest extends Abs
mavenBundle("org.apache.aries.application", "org.apache.aries.application.api"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller"),
+ mavenBundle("org.apache.aries.application", "org.apache.aries.application.default.local.platform"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.platform.repo"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.postresolve.process"),
mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.resolver.obr"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.deployment.management"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.management"),
- mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime").noStart(),
+ mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime.itest.interfaces"),
mavenBundle("org.osgi", "org.osgi.compendium"),
mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit"),
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java?rev=1022285&r1=1022284&r2=1022285&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java Wed Oct 13 20:36:24 2010
@@ -40,8 +40,8 @@ import org.apache.aries.application.mana
import org.apache.aries.application.management.ResolveConstraint;
import org.apache.aries.application.management.UpdateException;
import org.apache.aries.application.management.spi.framework.BundleFramework;
-import org.apache.aries.application.management.spi.repository.BundleRepository.BundleSuggestion;
import org.apache.aries.application.management.spi.repository.RepositoryGenerator;
+import org.apache.aries.application.management.spi.repository.BundleRepository.BundleSuggestion;
import org.apache.aries.application.management.spi.update.UpdateStrategy;
import org.apache.aries.application.modelling.ModellingManager;
import org.apache.aries.application.runtime.itests.util.IsolationTestUtils;
@@ -262,6 +262,7 @@ public class UpdateAppTest extends Abstr
mavenBundle("org.apache.aries.application", "org.apache.aries.application.api"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller"),
+ mavenBundle("org.apache.aries.application", "org.apache.aries.application.default.local.platform"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.platform.repo"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.postresolve.process"),
mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/application/application-utils/src/main/java/org/apache/aries/application/utils/runtime/DefaultLocalPlatform.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/application/application-utils/src/main/java/org/apache/aries/application/utils/runtime/DefaultLocalPlatform.java?rev=1022285&r1=1022284&r2=1022285&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/application/application-utils/src/main/java/org/apache/aries/application/utils/runtime/DefaultLocalPlatform.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/application/application-utils/src/main/java/org/apache/aries/application/utils/runtime/DefaultLocalPlatform.java Wed Oct 13 20:36:24 2010
@@ -1,37 +0,0 @@
-/*
- * 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.aries.application.utils.runtime;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.apache.aries.application.management.spi.runtime.LocalPlatform;
-
-public class DefaultLocalPlatform implements LocalPlatform {
-
- public File getTemporaryDirectory() throws IOException {
- File f = File.createTempFile("ebaTmp", null);
- f.delete();
- f.mkdir();
- return f;
- }
- public File getTemporaryFile () throws IOException {
- return File.createTempFile("ebaTmp", null);
- }
-}
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/application/application-utils/src/main/resources/OSGI-INF/blueprint/app-utils.xml
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/application/application-utils/src/main/resources/OSGI-INF/blueprint/app-utils.xml?rev=1022285&r1=1022284&r2=1022285&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/application/application-utils/src/main/resources/OSGI-INF/blueprint/app-utils.xml (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/application/application-utils/src/main/resources/OSGI-INF/blueprint/app-utils.xml Wed Oct 13 20:36:24 2010
@@ -25,13 +25,4 @@
<bean id="deploymentMf-factory" class="org.apache.aries.application.impl.DeploymentMetadataFactoryImpl" />
<service interface="org.apache.aries.application.DeploymentMetadataFactory" ref="deploymentMf-factory" />
- <!-- Default implementations of services that must be implemented against a
- particular application server environment follow -->
-
- <bean id="default-local-platform" class="org.apache.aries.application.utils.runtime.DefaultLocalPlatform" />
-
- <service interface="org.apache.aries.application.management.spi.runtime.LocalPlatform"
- ref="default-local-platform"
- ranking="-1" />
-
</blueprint>
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/application/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/application/pom.xml?rev=1022285&r1=1022284&r2=1022285&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/application/pom.xml (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/application/pom.xml Wed Oct 13 20:36:24 2010
@@ -181,21 +181,26 @@
<artifactId>org.apache.aries.application.modeller</artifactId>
<version>${project.version}</version>
</dependency>
-<dependency>
+ <dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.resolver.noop</artifactId>
<version>${project.version}</version>
</dependency>
-<dependency>
+ <dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.noop.platform.repo</artifactId>
<version>${project.version}</version>
</dependency>
-<dependency>
+ <dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.noop.postresolve.process</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.aries.application</groupId>
+ <artifactId>org.apache.aries.application.default.local.platform</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -220,6 +225,7 @@
<module>application-modeller</module>
<module>application-noop-platform-repository</module>
<module>application-noop-postresolve-process</module>
+ <module>application-default-local-platform</module>
</modules>
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/jndi/jndi-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/jndi/jndi-core/pom.xml?rev=1022285&r1=1022284&r2=1022285&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/jndi/jndi-core/pom.xml (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/jndi/jndi-core/pom.xml Wed Oct 13 20:36:24 2010
@@ -33,7 +33,9 @@
<properties>
<aries.osgi.private.pkg>
- org.apache.aries.jndi*
+ org.apache.aries.jndi,
+ org.apache.aries.jndi.startup,
+ org.apache.aries.jndi.tracker
</aries.osgi.private.pkg>
<aries.osgi.activator>
org.apache.aries.jndi.startup.Activator
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleHelper.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleHelper.java?rev=1022285&r1=1022284&r2=1022285&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleHelper.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleHelper.java Wed Oct 13 20:36:24 2010
@@ -24,12 +24,14 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.Dictionary;
import java.util.HashSet;
import java.util.jar.JarEntry;
import java.util.jar.JarInputStream;
import org.apache.aries.jpa.container.parsing.PersistenceDescriptor;
import org.osgi.framework.Bundle;
+import org.osgi.framework.Constants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -60,34 +62,47 @@ public class PersistenceBundleHelper
* @return
*/
public static Collection<PersistenceDescriptor> findPersistenceXmlFiles(Bundle bundle)
- {
- String header = (String) bundle.getHeaders().get(PERSISTENCE_UNIT_HEADER);
- if (header == null) {
- return Collections.emptySet();
- }
+ {
+ Dictionary<String, String> headers = bundle.getHeaders();
+ String metaPersistence = headers.get(PERSISTENCE_UNIT_HEADER);
+ String webContextPath = headers.get(WEB_CONTEXT_PATH_HEADER);
+
+ Collection<String> locations;
+
+ if (metaPersistence == null) {
+ if(webContextPath == null) {
+ return Collections.emptySet();
+ } else {
+ // WABs behave a bit differently to normal bundles. We process them even if they don't have a Meta-Persistence
+
+ if(_logger.isInfoEnabled())
+ _logger.info("The bundle " + bundle.getSymbolicName() + " specifies both the " +
+ WEB_CONTEXT_PATH_HEADER + " header, but it does not specify the " + PERSISTENCE_UNIT_HEADER + " header." +
+ " This bundle will be scanned for persistence descriptors in any locations defined by the JPA specification" +
+ "that are on the Classpath.");
+
+ String bundleClassPath = headers.get(Constants.BUNDLE_CLASSPATH);
+
+ locations = findWABClassPathLocations(bundleClassPath);
+ }
+ } else {
+
+ //Always search the default location, and use a set so we don't search the same
+ //location twice!
+ locations = new HashSet<String>();
+ locations.add(PERSISTENCE_XML);
- // Do not scan WABs
- if (bundle.getHeaders().get(WEB_CONTEXT_PATH_HEADER) != null) {
- _logger.warn("The bundle " + bundle.getSymbolicName() + " specifies both the " +
- PERSISTENCE_UNIT_HEADER + " and the " + WEB_CONTEXT_PATH_HEADER + " header. WABs that use JPA " +
- "are not supported as part of the OSGi JPA specification. No persistence descriptors will be processed" +
- "for this bundle.");
- return Collections.emptySet();
+ if(!!!metaPersistence.isEmpty()) {
+ //Split apart the header to get the individual entries
+ for (String s : metaPersistence.split(",")) {
+ locations.add(s.trim());
+ }
+ }
}
-
+
//The files we have found
Collection<PersistenceDescriptor> persistenceXmlFiles = new ArrayList<PersistenceDescriptor>();
- //Always search the default location, and use a set so we don't search the same
- //location twice!
- Collection<String> locations = new HashSet<String>();
- locations.add(PERSISTENCE_XML);
-
- //Split apart the header to get the individual entries
- for (String s : header.split(",")) {
- locations.add(s.trim());
- }
-
//Find the file and add it to our list
for (String location : locations) {
try {
@@ -122,6 +137,45 @@ public class PersistenceBundleHelper
return persistenceXmlFiles;
}
+ private static Collection<String> findWABClassPathLocations(String bundleClassPath) {
+
+ Collection<String> locations = new HashSet<String>();
+
+ if(bundleClassPath == null || bundleClassPath.isEmpty()) {
+ locations.add(PERSISTENCE_XML);
+ } else {
+ //Remove quoted parameters (that may have , or ; in them)
+ bundleClassPath = bundleClassPath.replaceAll(";[^;,]*?=\\s*\".*?\"", "");
+ //Remove any other parameters
+ bundleClassPath = bundleClassPath.replaceAll(";[^;,]*?=[^;,]*", ",");
+ //Remove any ";" left
+ bundleClassPath = bundleClassPath.replace(';', ',');
+
+ //Tidy up any duplicate "," we have ended up with
+ bundleClassPath = bundleClassPath.replaceAll(",+", ",");
+
+ //Finally we have the entries we want
+ String[] entries = bundleClassPath.split(",");
+
+ for(String entry : entries) {
+ entry = entry.trim();
+ if(entry.isEmpty())
+ continue;
+ else if(".".equals(entry)) {
+ locations.add(PERSISTENCE_XML);
+ } else if(entry.endsWith(".jar")) {
+ locations.add(entry + "!/" + PERSISTENCE_XML);
+ } else {
+ if(!!!entry.endsWith("/"))
+ entry = entry + "/";
+
+ locations.add(entry + PERSISTENCE_XML);
+ }
+ }
+ }
+ return locations;
+ }
+
/**
* Locate a persistence descriptor file in a bundle
* based on a String name.
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/PersistenceBundleLifecycleTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/PersistenceBundleLifecycleTest.java?rev=1022285&r1=1022284&r2=1022285&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/PersistenceBundleLifecycleTest.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/PersistenceBundleLifecycleTest.java Wed Oct 13 20:36:24 2010
@@ -28,10 +28,13 @@ import static org.junit.Assert.assertTru
import java.io.BufferedWriter;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.FileOutputStream;
+import java.io.IOException;
import java.io.OutputStreamWriter;
import java.lang.reflect.Field;
import java.net.MalformedURLException;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.Collections;
import java.util.Dictionary;
@@ -176,20 +179,51 @@ public class PersistenceBundleLifecycleT
public void testManager_WABandJPABundle() throws Exception
{
BundleContext ctx = preExistingBundleSetup();
- setupPersistenceBundle("file23", "");
+ setupPersistenceBundle("file4", "");
persistenceBundle.getHeaders().put("Web-ContextPath", "/test");
// make sure we don't succeed because of not having a provider
Hashtable<String,Object> hash1 = new Hashtable<String, Object>();
- hash1.put("javax.persistence.provider", "use.this.Provider");
+ hash1.put("javax.persistence.provider", "no.such.Provider");
hash1.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE);
ServiceRegistration reg = persistenceBundle.getBundleContext().registerService(new String[] {PersistenceProvider.class.getName()} ,
pp, hash1 );
-
+ ServiceReference ref = reg.getReference();
+
mgr.start(ctx);
- BundleContextMock.assertNoServiceExists(EntityManagerFactory.class.getName());
- assertNull("We should not have an EntityManagerFactoryManager", getTrackedObject());
+ //Check the persistence.xml was looked for
+ Skeleton.getSkeleton(persistenceBundle).assertCalled(new MethodCall(Bundle.class, "getEntry", "META-INF/persistence.xml"));
+ //Check we didn't use getResource()
+ Skeleton.getSkeleton(persistenceBundle).assertNotCalled(new MethodCall(Bundle.class, "getResource", String.class));
+
+ testSuccessfulCreationEvent(ref, ctx, 1);
+ testSuccessfulRegistrationEvent(ref, ctx, 1);
+
+ assertNotNull("We should not have an EntityManagerFactoryManager", getTrackedObject());
+ }
+
+ @Test
+ public void testManager_WABNoMetaPersistence() throws Exception {
+
+
+ BundleContext extenderContext = preExistingBundleSetup();
+
+ Hashtable<String,String> hash1 = new Hashtable<String, String>();
+ hash1.put("javax.persistence.provider", "no.such.Provider");
+ ServiceRegistration reg = persistenceBundle.getBundleContext().registerService(new String[] {PersistenceProvider.class.getName()} ,
+ pp, hash1 );
+
+ ServiceReference ref = reg.getReference();
+ setupWABBundle();
+
+ mgr.start(extenderContext);
+
+
+ Skeleton.getSkeleton(persistenceBundle).assertCalledExactNumberOfTimes(new MethodCall(Bundle.class, "getEntry", String.class), 3);
+
+ testSuccessfulCreationEvent(ref, extenderContext, 3);
+ testSuccessfulRegistrationEvent(ref, extenderContext, 3, "webInfClassesOnClassPath", "jarOne", "jarTwo");
}
@Test
@@ -1203,6 +1237,66 @@ public class PersistenceBundleLifecycleT
}
+ private void setupWABBundle() throws Exception {
+
+ persistenceBundle.getHeaders().put("Web-ContextPath", "/test2");
+ persistenceBundle.getHeaders().put("Bundle-ClassPath", "WEB-INF/classes/onClasspath, WEB-INF/lib/onClasspath.jar;" +
+ " WEB-INF/lib/alsoOnClasspath.jar; prop=\"value\"; complexProp:=\"a,b\";complexProp2:= \"c;d\";anotherProp=anotherValue; yetMoreProp=something");
+
+ Skeleton skel = Skeleton.getSkeleton(persistenceBundle);
+ skel.setReturnValue(new MethodCall(Bundle.class, "getState"), Bundle.ACTIVE);
+
+ URL xml = getClass().getClassLoader().getResource("file23/META-INF/persistence.xml");
+ skel.setReturnValue(new MethodCall(Bundle.class, "getEntry", "META-INF/persistence.xml"), xml);
+
+ xml = getClass().getClassLoader().getResource("file23/WEB-INF/classes/onClasspath/META-INF/persistence.xml");
+ skel.setReturnValue(new MethodCall(Bundle.class, "getEntry", "WEB-INF/classes/onClasspath/META-INF/persistence.xml"), xml);
+
+ xml = getClass().getClassLoader().getResource("file23/WEB-INF/classes/notOnClasspath/META-INF/persistence.xml");
+ skel.setReturnValue(new MethodCall(Bundle.class, "getEntry", "WEB-INF/classes/notOnClasspath/META-INF/persistence.xml"), xml);
+
+ URL root = getClass().getClassLoader().getResource("file23");
+
+ buildJarFile(skel, root, "WEB-INF/lib/onClasspath.jar", "jarOne");
+ buildJarFile(skel, root, "WEB-INF/lib/alsoOnClasspath.jar", "jarTwo");
+
+ buildJarFile(skel, root, "WEB-INF/lib/notOnClasspath.jar", "jarNotOnClassPath");
+
+ skel.setReturnValue(new MethodCall(Bundle.class, "getVersion"), new Version("0.0.0"));
+
+ }
+
+ private void buildJarFile(Skeleton skel, URL root, String filePath, String pUnitName) throws URISyntaxException,
+ IOException, FileNotFoundException {
+
+ File f = new File(new File(root.toURI()), filePath);
+
+ f.getParentFile().mkdirs();
+
+ JarOutputStream jos = new JarOutputStream(new FileOutputStream(f));
+
+ jos.putNextEntry(new ZipEntry("META-INF/persistence.xml"));
+
+ BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(jos));
+ writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+ writer.newLine();
+ writer.write("<persistence xmlns=\"http://java.sun.com/xml/ns/persistence\"");
+ writer.newLine();
+ writer.write("xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"");
+ writer.newLine();
+ writer.write("xsi:schemaLocation=\"http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd\"");
+ writer.newLine();
+ writer.write("version=\"1.0\">");
+ writer.newLine();
+ writer.write("<persistence-unit name=\"" + pUnitName + "\"/>");
+ writer.newLine();
+ writer.write("</persistence>");
+
+ writer.close();
+
+ skel.setReturnValue(new MethodCall(Bundle.class, "getEntry", filePath), f.toURI().toURL());
+ }
+
private void setupPersistenceBundle(String root, String header) throws MalformedURLException
{
persistenceBundle.getHeaders().put("Meta-Persistence", header);
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/equinox-test-harness/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/equinox-test-harness/pom.xml?rev=1022285&r1=1022284&r2=1022285&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/equinox-test-harness/pom.xml (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/equinox-test-harness/pom.xml Wed Oct 13 20:36:24 2010
@@ -202,6 +202,11 @@
<artifactId>org.apache.aries.application.noop.platform.repo</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.aries.application</groupId>
+ <artifactId>org.apache.aries.application.default.local.platform</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.noop.postresolve.process</artifactId>
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini?rev=1022285&r1=1022284&r2=1022285&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini Wed Oct 13 20:36:24 2010
@@ -46,6 +46,7 @@ org.apache.aries.application.modeller-${
org.apache.aries.application.resolver.obr-${ariesApplicationVersion}.jar@start,\
org.apache.aries.application.noop.platform.repo-${ariesApplicationVersion}.jar@start,\
org.apache.aries.application.noop.postresolve.process-${ariesApplicationVersion}.jar@start,\
+org.apache.aries.application.default.local.platform-${ariesApplicationVersion}.jar@start,\
org.apache.aries.jndi-${ariesJndiVersion}.jar@start,\
org.apache.aries.jpa.api-${ariesJpaVersion}.jar@start,\
org.apache.aries.jpa.blueprint.aries-${ariesJpaVersion}.jar@start,\
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-assembly/pom.xml?rev=1022285&r1=1022284&r2=1022285&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-assembly/pom.xml (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-assembly/pom.xml Wed Oct 13 20:36:24 2010
@@ -182,6 +182,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.aries.application</groupId>
+ <artifactId>org.apache.aries.application.default.local.platform</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.noop.postresolve.process</artifactId>
</dependency>
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini?rev=1022285&r1=1022284&r2=1022285&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini Wed Oct 13 20:36:24 2010
@@ -37,6 +37,7 @@ org.apache.aries.application.modeller-${
org.apache.aries.application.resolver.obr-${ariesApplicationVersion}.jar@start,\
org.apache.aries.application.noop.platform.repo-${ariesApplicationVersion}.jar@start,\
org.apache.aries.application.noop.postresolve.process-${ariesApplicationVersion}.jar@start,\
+org.apache.aries.application.default.local.platform-${ariesApplicationVersion}.jar@start,\
org.apache.felix.fileinstall-2.0.8.jar@start,\
org.apache.felix.bundlerepository-1.6.4.jar@start,\
org.apache.aries.application.runtime-${ariesApplicationVersion}.jar@start,\
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/pom.xml?rev=1022285&r1=1022284&r2=1022285&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/pom.xml (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/pom.xml Wed Oct 13 20:36:24 2010
@@ -345,6 +345,11 @@
<artifactId>org.apache.aries.application.noop.postresolve.process</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.aries.application</groupId>
+ <artifactId>org.apache.aries.application.default.local.platform</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java?rev=1022285&r1=1022284&r2=1022285&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java Wed Oct 13 20:36:24 2010
@@ -142,6 +142,7 @@ public class JdbcBlogSampleWithEbaTest e
mavenBundle("org.apache.aries.application", "org.apache.aries.application.management" ),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime" ),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils" ),
+ mavenBundle("org.apache.aries.application", "org.apache.aries.application.default.local.platform"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.platform.repo"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.postresolve.process"),
mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java?rev=1022285&r1=1022284&r2=1022285&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java Wed Oct 13 20:36:24 2010
@@ -163,6 +163,7 @@ bootDelegationPackages("javax.transactio
mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime" ),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils" ),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller"),
+ mavenBundle("org.apache.aries.application", "org.apache.aries.application.default.local.platform"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.platform.repo"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.postresolve.process"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.deployment.management"),
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java?rev=1022285&r1=1022284&r2=1022285&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java Wed Oct 13 20:36:24 2010
@@ -222,6 +222,7 @@ bootDelegationPackages("javax.transactio
mavenBundle("org.apache.aries.application", "org.apache.aries.application.install" ),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.api" ),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.management" ),
+ mavenBundle("org.apache.aries.application", "org.apache.aries.application.default.local.platform"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.platform.repo"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.postresolve.process"),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime" ),
Modified: incubator/aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-assembly/pom.xml?rev=1022285&r1=1022284&r2=1022285&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-assembly/pom.xml (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-assembly/pom.xml Wed Oct 13 20:36:24 2010
@@ -152,6 +152,11 @@
<artifactId>org.apache.aries.application.noop.postresolve.process</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.aries.application</groupId>
+ <artifactId>org.apache.aries.application.default.local.platform</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.aries.samples.goat</groupId>
<artifactId>org.apache.aries.samples.goat.api</artifactId>