[webbeans-commits] Webbeans SVN: r2508 - in ri/trunk/impl/src/main/java/org/jboss/webbeans: bootstrap and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-04-17 20:46:28 -0400 (Fri, 17 Apr 2009)
New Revision: 2508
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ApplicationContext.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ConversationContext.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/context/RequestContext.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java
Log:
Move contexts to use the service registry
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-04-18 00:37:50 UTC (rev 2507)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-04-18 00:46:28 UTC (rev 2508)
@@ -1146,10 +1146,10 @@
{
log.trace("Ending application");
shutdownExecutors();
- CurrentManager.cleanup();
ApplicationContext.instance().destroy();
ApplicationContext.instance().setActive(false);
ApplicationContext.instance().setBeanStore(null);
+ CurrentManager.cleanup();
}
/**
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-04-18 00:37:50 UTC (rev 2507)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-04-18 00:46:28 UTC (rev 2508)
@@ -115,6 +115,7 @@
log.info("@Resource injection not available.");
}
addImplementationServices();
+ createContexts();
this.manager = ManagerImpl.newRootManager(ServiceRegistries.unmodifiableServiceRegistry(getServices()));
CurrentManager.setRootManager(manager);
initializeContexts();
@@ -221,12 +222,21 @@
protected void initializeContexts()
{
- manager.addContext(DependentContext.create());
- manager.addContext(RequestContext.create());
- manager.addContext(SessionContext.create());
- manager.addContext(ApplicationContext.create());
- manager.addContext(ConversationContext.create());
+ manager.addContext(DependentContext.instance());
+ manager.addContext(RequestContext.instance());
+ manager.addContext(ConversationContext.instance());
+ manager.addContext(SessionContext.instance());
+ manager.addContext(ApplicationContext.instance());
}
+
+ protected void createContexts()
+ {
+ getServices().add(DependentContext.class, new DependentContext());
+ getServices().add(RequestContext.class, new RequestContext());
+ getServices().add(ConversationContext.class, new ConversationContext());
+ getServices().add(SessionContext.class, new SessionContext());
+ getServices().add(ApplicationContext.class, new ApplicationContext());
+ }
protected void beginApplication(BeanStore applicationBeanStore)
{
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ApplicationContext.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ApplicationContext.java 2009-04-18 00:37:50 UTC (rev 2507)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ApplicationContext.java 2009-04-18 00:46:28 UTC (rev 2508)
@@ -27,8 +27,8 @@
import javax.context.ApplicationScoped;
-import org.jboss.webbeans.bootstrap.api.Singleton;
-import org.jboss.webbeans.bootstrap.api.SingletonProvider;
+import org.jboss.webbeans.CurrentManager;
+import org.jboss.webbeans.bootstrap.api.Service;
import org.jboss.webbeans.context.api.BeanStore;
/**
@@ -38,23 +38,14 @@
*
* @see org.jboss.webbeans.context.ApplicationContext
*/
-public class ApplicationContext extends AbstractMapContext
+public class ApplicationContext extends AbstractMapContext implements Service
{
-
- private static Singleton<ApplicationContext> INSTANCE = SingletonProvider.instance().create(ApplicationContext.class);
public static ApplicationContext instance()
{
- return INSTANCE.get();
+ return CurrentManager.rootManager().getServices().get(ApplicationContext.class);
}
- public static ApplicationContext create()
- {
- ApplicationContext context = new ApplicationContext();
- INSTANCE.set(context);
- return context;
- }
-
// The beans
private BeanStore beanStore;
// Is the context active?
@@ -63,7 +54,7 @@
/**
* Constructor
*/
- protected ApplicationContext()
+ public ApplicationContext()
{
super(ApplicationScoped.class);
this.active = new AtomicBoolean(false);
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ConversationContext.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ConversationContext.java 2009-04-18 00:37:50 UTC (rev 2507)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ConversationContext.java 2009-04-18 00:46:28 UTC (rev 2508)
@@ -25,35 +25,25 @@
import javax.context.ConversationScoped;
+import org.jboss.webbeans.CurrentManager;
+import org.jboss.webbeans.bootstrap.api.Service;
import org.jboss.webbeans.log.LogProvider;
import org.jboss.webbeans.log.Logging;
-import org.jboss.webbeans.bootstrap.api.Singleton;
-import org.jboss.webbeans.bootstrap.api.SingletonProvider;
/**
* The conversation context
*
* @author Nicklas Karlsson
*/
-public class ConversationContext extends AbstractThreadLocalMapContext
+public class ConversationContext extends AbstractThreadLocalMapContext implements Service
{
private static LogProvider log = Logging.getLogProvider(ConversationContext.class);
- private static Singleton<ConversationContext> INSTANCE =
- SingletonProvider.instance().create(ConversationContext.class);
-
public static ConversationContext instance()
{
- return INSTANCE.get();
+ return CurrentManager.rootManager().getServices().get(ConversationContext.class);
}
- public static ConversationContext create()
- {
- ConversationContext context = new ConversationContext();
- INSTANCE.set(context);
- return context;
- }
-
/**
* Constructor
*/
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java 2009-04-18 00:37:50 UTC (rev 2507)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java 2009-04-18 00:46:28 UTC (rev 2508)
@@ -30,30 +30,22 @@
import javax.context.CreationalContext;
import javax.context.Dependent;
-import org.jboss.webbeans.bootstrap.api.Singleton;
-import org.jboss.webbeans.bootstrap.api.SingletonProvider;
+import org.jboss.webbeans.CurrentManager;
+import org.jboss.webbeans.bootstrap.api.Service;
/**
* The dependent context
*
* @author Nicklas Karlsson
*/
-public class DependentContext extends AbstractContext
+public class DependentContext extends AbstractContext implements Service
{
- private static Singleton<DependentContext> INSTANCE = SingletonProvider.instance().create(DependentContext.class);
public static DependentContext instance()
{
- return INSTANCE.get();
+ return CurrentManager.rootManager().getServices().get(DependentContext.class);
}
- public static DependentContext create()
- {
- DependentContext ctx = new DependentContext();
- INSTANCE.set(ctx);
- return ctx;
- }
-
private final ThreadLocal<AtomicInteger> reentrantActiveCount;
// A (possible null) request to store dependents created
private final ThreadLocal<DependentStorageRequest> dependentStorageRequest;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/RequestContext.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/RequestContext.java 2009-04-18 00:37:50 UTC (rev 2507)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/RequestContext.java 2009-04-18 00:46:28 UTC (rev 2508)
@@ -25,35 +25,26 @@
import javax.context.RequestScoped;
-import org.jboss.webbeans.bootstrap.api.Singleton;
-import org.jboss.webbeans.bootstrap.api.SingletonProvider;
+import org.jboss.webbeans.CurrentManager;
+import org.jboss.webbeans.bootstrap.api.Service;
/**
* The request context
*
* @author Nicklas Karlsson
*/
-public class RequestContext extends AbstractThreadLocalMapContext
+public class RequestContext extends AbstractThreadLocalMapContext implements Service
{
-
- private static Singleton<RequestContext> INSTANCE = SingletonProvider.instance().create(RequestContext.class);
public static RequestContext instance()
{
- return INSTANCE.get();
+ return CurrentManager.rootManager().getServices().get(RequestContext.class);
}
- public static RequestContext create()
- {
- RequestContext context = new RequestContext();
- INSTANCE.set(context);
- return context;
- }
-
/**
* Constructor
*/
- protected RequestContext()
+ public RequestContext()
{
super(RequestScoped.class);
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java 2009-04-18 00:37:50 UTC (rev 2507)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java 2009-04-18 00:46:28 UTC (rev 2508)
@@ -25,8 +25,8 @@
import javax.context.SessionScoped;
-import org.jboss.webbeans.bootstrap.api.Singleton;
-import org.jboss.webbeans.bootstrap.api.SingletonProvider;
+import org.jboss.webbeans.CurrentManager;
+import org.jboss.webbeans.bootstrap.api.Service;
import org.jboss.webbeans.log.LogProvider;
import org.jboss.webbeans.log.Logging;
@@ -35,28 +35,19 @@
*
* @author Nicklas Karlsson
*/
-public class SessionContext extends AbstractThreadLocalMapContext
+public class SessionContext extends AbstractThreadLocalMapContext implements Service
{
private static LogProvider log = Logging.getLogProvider(SessionContext.class);
- private static Singleton<SessionContext> INSTANCE = SingletonProvider.instance().create(SessionContext.class);
-
public static SessionContext instance()
{
- return INSTANCE.get();
+ return CurrentManager.rootManager().getServices().get(SessionContext.class);
}
- public static SessionContext create()
- {
- SessionContext context = new SessionContext();
- INSTANCE.set(context);
- return context;
- }
-
/**
* Constructor
*/
- protected SessionContext()
+ public SessionContext()
{
super(SessionScoped.class);
log.trace("Created session context");
16 years, 12 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2507 - in ri/trunk: osgi-bundle and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-04-17 20:37:50 -0400 (Fri, 17 Apr 2009)
New Revision: 2507
Added:
ri/trunk/osgi-bundle/
ri/trunk/osgi-bundle/pom.xml
Modified:
ri/trunk/pom.xml
Log:
osgi bundle
Added: ri/trunk/osgi-bundle/pom.xml
===================================================================
--- ri/trunk/osgi-bundle/pom.xml (rev 0)
+++ ri/trunk/osgi-bundle/pom.xml 2009-04-18 00:37:50 UTC (rev 2507)
@@ -0,0 +1,122 @@
+<!--
+/*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+*
+* Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
+*
+* Use is subject to license terms.
+*
+* Licensed 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.
+*/
+-->
+<project>
+ <parent>
+ <artifactId>webbeans-parent</artifactId>
+ <groupId>org.jboss.webbeans</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-osgi-bundle</artifactId>
+ <name>Web Beans OSGi Bundle</name>
+ <description>Web Beans implementation packaged as an OSGi bundle</description>
+
+ <developers>
+ <developer>
+ <id>ss141213</id>
+ <name>Sanjeeb Sahoo</name>
+ <url>http://weblogs.dev.java.net/ss141213</url>
+ <organization>Sun Microsystems, Inc.</organization>
+ <roles>
+ <role>developer</role>
+ </roles>
+ </developer>
+ </developers>
+
+ <properties>
+ <osgi.version>1.0</osgi.version>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.0.0</version>
+ <configuration>
+ <instructions>
+ <_include>-osgi.bundle</_include>
+ <Embed-Dependency>*; scope=compile; inline=true</Embed-Dependency>
+ <_exportcontents>javax.event; javax.context; javax.webbeans; javax.decorator; javax.inject; javax.inject.manager; version=${osgi.version},
+ org.jboss.webbeans.*.api.*; org.jboss.webbeans.*.spi.*; org.jboss.webbeans.conversation; org.jboss.webbeans.bootstrap; org.jboss.webbeans.introspector; org.jboss.webbeans.servlet; version=${osgi.version},
+ org.jboss.webbeans.el; include:="WebBeansELResolver"; version=${osgi.version},
+ org.jboss.webbeans.jsf; include:="WebBeansPhaseListener"; version=${osgi.version},
+ javassist.util.proxy;version="3.8.1.GA"
+ </_exportcontents>
+ <Import-Package>javax.annotation, javax.interceptor, *;resolution:=optional</Import-Package>
+ <Private-Package>!javax.annotation.*, !javax.interceptor.*</Private-Package>
+ </instructions>
+ <!-- Maven uses the output directory (target/classes)
+ rather than the final bundle, when compiling against
+ projects in the same reactor (ie. the same build).
+ Since this jar comprises of classes that come from
+ some other jar and other modules may depend on this
+ artifact, we need to unpack.
+ -->
+ <unpackBundle>true</unpackBundle>
+ </configuration>
+ <executions>
+ <execution>
+ <id>osgi-bundle</id>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>jsr299-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-spi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-logging</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Modified: ri/trunk/pom.xml
===================================================================
--- ri/trunk/pom.xml 2009-04-18 00:25:35 UTC (rev 2506)
+++ ri/trunk/pom.xml 2009-04-18 00:37:50 UTC (rev 2507)
@@ -76,6 +76,7 @@
<module>osgi-bundle</module>
</modules>
</profile>
+
</profiles>
16 years, 12 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2506 - in ri/trunk/tests: src/test/java/org/jboss and 6 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-04-17 20:25:35 -0400 (Fri, 17 Apr 2009)
New Revision: 2506
Added:
ri/trunk/tests/src/test/java/org/jboss/jsr299/
ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/
ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/
ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/
ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/
ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/
ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/AlteStadt.java
ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/DirectOrderProcessor.java
ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/DirectOrderProcessorLocal.java
ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java
ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/GeschichtslosStadt.java
ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Giessen.java
ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/GrossStadt.java
ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/GutenbergMuseum.java
ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/IndirectOrderProcessor.java
ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/IntermediateOrderProcessor.java
ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java
ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/KleinStadt.java
ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/LandgraffenSchloss.java
ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Mainz.java
ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Marburg.java
ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/MockCreationalContext.java
ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/NeueStadt.java
ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/OrderProcessor.java
ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/OrderProcessorLocal.java
ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/RoemerPassage.java
ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Schloss.java
ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/SchoeneStadt.java
ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/UniStadt.java
Modified:
ri/trunk/tests/unit-tests.xml
Log:
TCK test for Andy to work with remove method stuff in core test - to be removed once Andy is done
Added: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/AlteStadt.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/AlteStadt.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/AlteStadt.java 2009-04-18 00:25:35 UTC (rev 2506)
@@ -0,0 +1,15 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
+
+import javax.ejb.Local;
+
+@Local
+public interface AlteStadt
+{
+ public String getPlaceOfInterest();
+
+ public void performPostConstructChecks();
+
+ public void initializeBean(GutenbergMuseum pointOfInterest);
+
+ public GutenbergMuseum getAnotherPlaceOfInterest();
+}
Property changes on: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/AlteStadt.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/DirectOrderProcessor.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/DirectOrderProcessor.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/DirectOrderProcessor.java 2009-04-18 00:25:35 UTC (rev 2506)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
+
+import javax.ejb.Stateful;
+
+@Stateful
+public class DirectOrderProcessor extends OrderProcessor implements DirectOrderProcessorLocal
+{
+
+}
Property changes on: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/DirectOrderProcessor.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/DirectOrderProcessorLocal.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/DirectOrderProcessorLocal.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/DirectOrderProcessorLocal.java 2009-04-18 00:25:35 UTC (rev 2506)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
+
+import javax.ejb.Local;
+
+@Local
+public interface DirectOrderProcessorLocal
+{
+ void order();
+}
Property changes on: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/DirectOrderProcessorLocal.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-04-18 00:25:35 UTC (rev 2506)
@@ -0,0 +1,87 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.context.Context;
+import javax.context.CreationalContext;
+import javax.context.RequestScoped;
+import javax.inject.manager.Bean;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.testng.annotations.Test;
+
+/**
+ * Sections
+ *
+ * 6.5. Lifecycle of stateful session beans
+ * 6.6. Lifecycle of stateless session and singleton beans
+ * 6.11. Lifecycle of EJBs
+ *
+ * Mostly overlapping with other tests...
+ *
+ * @author Nicklas Karlsson
+ * @author David Allen
+ *
+ * Spec version: Public Release Draft 2
+ *
+ */
+@Artifact
+(a)Packaging(PackagingType.EAR)
+@IntegrationTest
+public class EnterpriseBeanLifecycleTest extends AbstractWebBeansTest
+{
+
+ /**
+ * When the create() method of a Bean object that represents a stateful
+ * session bean that is called, the container creates and returns a session
+ * bean proxy, as defined in Section 3.3.9, "Session bean proxies".
+ */
+ @Test(groups = { "enterpriseBeans", "clientProxy", "lifecycle", "integration" })
+ public void testCreateSFSB()
+ {
+ GrossStadt frankfurt = getCurrentManager().getInstanceByType(GrossStadt.class);
+ Bean<KleinStadt> stadtBean = getCurrentManager().resolveByType(KleinStadt.class).iterator().next();
+ assert stadtBean != null : "Expected a bean for stateful session bean Kassel";
+ CreationalContext<KleinStadt> creationalContext = new MockCreationalContext<KleinStadt>();
+ KleinStadt stadtInstance = stadtBean.create(creationalContext);
+ assert stadtInstance != null : "Expected instance to be created by container";
+ //assert frankfurt.isKleinStadtCreated() : "PostConstruct should be invoked when bean instance is created";
+ frankfurt.resetCreatedFlags();
+
+ // Create a second one to make sure create always does create a new session bean
+ KleinStadt anotherStadtInstance = stadtBean.create(creationalContext);
+ assert anotherStadtInstance != null : "Expected second instance of session bean";
+ //assert frankfurt.isKleinStadtCreated();
+ assert anotherStadtInstance != stadtInstance : "create() should not return same bean as before";
+
+ // Verify that the instance returned is a proxy by checking for all local interfaces
+ Set<Class<?>> interfaces = new HashSet<Class<?>>(Arrays.asList(stadtInstance.getClass().getInterfaces()));
+ assert interfaces.contains(KleinStadt.class);
+ assert interfaces.contains(SchoeneStadt.class);
+ //frankfurt.dispose();
+ }
+
+ @Test(groups = { "enterpriseBeans", "clientProxy", "lifecycle", "integration" })
+ public void testDestroyRemovesSFSB() throws Exception
+ {
+ GrossStadt frankfurt = getCurrentManager().getInstanceByType(GrossStadt.class);
+ Bean<KleinStadt> stadtBean = getCurrentManager().resolveByType(KleinStadt.class).iterator().next();
+ assert stadtBean != null : "Expected a bean for stateful session bean Kassel";
+ Context requestContext = getCurrentManager().getContext(RequestScoped.class);
+ CreationalContext<KleinStadt> creationalContext = new MockCreationalContext<KleinStadt>();
+ KleinStadt kassel = requestContext.get(stadtBean, creationalContext);
+ stadtBean.destroy(kassel);
+
+ assert frankfurt.isKleinStadtDestroyed() : "Expected SFSB bean to be destroyed";
+ kassel = requestContext.get(stadtBean);
+ assert kassel == null : "SFSB bean should not exist after being destroyed";
+ //frankfurt.dispose();
+ }
+
+}
Property changes on: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java 2009-04-18 00:25:35 UTC (rev 2506)
@@ -0,0 +1,62 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
+
+import javax.context.RequestScoped;
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+
+@Stateful
+@RequestScoped
+public class FrankfurtAmMain implements GrossStadt
+{
+
+ private boolean kleinStadtCreated = false;
+ private boolean kleinStadtDestroyed = false;
+
+ public boolean isKleinStadtCreated()
+ {
+ return kleinStadtCreated;
+ }
+
+ public boolean isKleinStadtDestroyed()
+ {
+ return kleinStadtDestroyed;
+ }
+
+ public void kleinStadtCreated()
+ {
+ kleinStadtCreated = true;
+ }
+
+ public void kleinStadtDestroyed()
+ {
+ kleinStadtDestroyed = true;
+ }
+
+ public void resetCreatedFlags()
+ {
+ kleinStadtCreated = false;
+ }
+
+ public void resetDestroyedFlags()
+ {
+ kleinStadtDestroyed = false;
+ }
+
+ @Remove
+ public void dispose()
+ {
+ }
+
+ private boolean schlossDestroyed = false;
+
+ public boolean isSchlossDestroyed()
+ {
+ return schlossDestroyed;
+ }
+
+ public void schlossDestroyed()
+ {
+ schlossDestroyed = true;
+ }
+
+}
Property changes on: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/GeschichtslosStadt.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/GeschichtslosStadt.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/GeschichtslosStadt.java 2009-04-18 00:25:35 UTC (rev 2506)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
+
+import javax.ejb.Local;
+
+@Local
+public interface GeschichtslosStadt
+{
+
+}
Property changes on: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/GeschichtslosStadt.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Giessen.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Giessen.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Giessen.java 2009-04-18 00:25:35 UTC (rev 2506)
@@ -0,0 +1,10 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
+
+public class Giessen implements NeueStadt, GeschichtslosStadt
+{
+
+ public void mehrBauen()
+ {
+ }
+
+}
Property changes on: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Giessen.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/GrossStadt.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/GrossStadt.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/GrossStadt.java 2009-04-18 00:25:35 UTC (rev 2506)
@@ -0,0 +1,25 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
+
+import javax.ejb.Local;
+
+@Local
+public interface GrossStadt
+{
+ public void kleinStadtCreated();
+
+ public void kleinStadtDestroyed();
+
+ public boolean isKleinStadtCreated();
+
+ public boolean isKleinStadtDestroyed();
+
+ public void resetCreatedFlags();
+
+ public void resetDestroyedFlags();
+
+ public void dispose();
+
+ public void schlossDestroyed();
+
+ public boolean isSchlossDestroyed();
+}
Property changes on: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/GrossStadt.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/GutenbergMuseum.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/GutenbergMuseum.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/GutenbergMuseum.java 2009-04-18 00:25:35 UTC (rev 2506)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
+
+public class GutenbergMuseum
+{
+
+}
Property changes on: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/GutenbergMuseum.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/IndirectOrderProcessor.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/IndirectOrderProcessor.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/IndirectOrderProcessor.java 2009-04-18 00:25:35 UTC (rev 2506)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
+
+import javax.ejb.Stateful;
+
+@Stateful
+public class IndirectOrderProcessor extends IntermediateOrderProcessor implements OrderProcessorLocal
+{
+
+}
\ No newline at end of file
Property changes on: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/IndirectOrderProcessor.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/IntermediateOrderProcessor.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/IntermediateOrderProcessor.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/IntermediateOrderProcessor.java 2009-04-18 00:25:35 UTC (rev 2506)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
+
+class IntermediateOrderProcessor extends OrderProcessor
+{
+
+}
\ No newline at end of file
Property changes on: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/IntermediateOrderProcessor.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java 2009-04-18 00:25:35 UTC (rev 2506)
@@ -0,0 +1,34 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.context.RequestScoped;
+import javax.ejb.EJB;
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+
+@Stateful
+@RequestScoped
+public class Kassel implements KleinStadt, SchoeneStadt
+{
+ @EJB
+ private GrossStadt grossStadt;
+
+ @PostConstruct
+ public void begruendet()
+ {
+ grossStadt.kleinStadtCreated();
+ }
+
+ @Remove
+ public void zustandVergessen()
+ {
+ }
+
+ @PreDestroy
+ public void zustandVerloren()
+ {
+ grossStadt.kleinStadtDestroyed();
+ }
+
+}
Property changes on: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/KleinStadt.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/KleinStadt.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/KleinStadt.java 2009-04-18 00:25:35 UTC (rev 2506)
@@ -0,0 +1,14 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
+
+import javax.ejb.Local;
+
+@Local
+public interface KleinStadt
+{
+ public void begruendet();
+
+ public void zustandVergessen();
+
+ public void zustandVerloren();
+
+}
Property changes on: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/KleinStadt.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/LandgraffenSchloss.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/LandgraffenSchloss.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/LandgraffenSchloss.java 2009-04-18 00:25:35 UTC (rev 2506)
@@ -0,0 +1,27 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
+
+import javax.annotation.PreDestroy;
+import javax.context.Dependent;
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.inject.Current;
+
+@Stateful
+@Dependent
+public class LandgraffenSchloss implements Schloss
+{
+ @Current
+ private GrossStadt biggerCity;
+
+ @PreDestroy
+ public void destructionCallback()
+ {
+ biggerCity.schlossDestroyed();
+ }
+
+ @Remove
+ public void remove()
+ {
+ }
+
+}
Property changes on: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/LandgraffenSchloss.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Mainz.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Mainz.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Mainz.java 2009-04-18 00:25:35 UTC (rev 2506)
@@ -0,0 +1,40 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
+
+import javax.annotation.PostConstruct;
+import javax.ejb.Stateless;
+import javax.inject.Current;
+import javax.inject.Initializer;
+
+@Stateless
+public class Mainz implements AlteStadt
+{
+ @Current
+ private RoemerPassage placeOfInterest;
+
+ private GutenbergMuseum anotherPlaceOfInterest;
+
+ private String name;
+
+ public String getPlaceOfInterest()
+ {
+ return name;
+ }
+
+ @PostConstruct
+ public void performPostConstructChecks()
+ {
+ if ( placeOfInterest != null )
+ name = placeOfInterest.getName();
+ }
+
+ @Initializer
+ public void initializeBean(@Current GutenbergMuseum pointOfInterest)
+ {
+ this.anotherPlaceOfInterest = pointOfInterest;
+ }
+
+ public GutenbergMuseum getAnotherPlaceOfInterest()
+ {
+ return anotherPlaceOfInterest;
+ }
+}
Property changes on: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Mainz.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Marburg.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Marburg.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Marburg.java 2009-04-18 00:25:35 UTC (rev 2506)
@@ -0,0 +1,18 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
+
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.inject.Current;
+
+@Stateful
+public class Marburg implements UniStadt
+{
+ @Current
+ private Schloss theCastle;
+
+ @Remove
+ public void removeBean()
+ {
+ }
+
+}
Property changes on: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Marburg.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/MockCreationalContext.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/MockCreationalContext.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/MockCreationalContext.java 2009-04-18 00:25:35 UTC (rev 2506)
@@ -0,0 +1,13 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
+
+import javax.context.CreationalContext;
+
+public class MockCreationalContext<T> implements CreationalContext<T>
+{
+
+ public void push(T incompleteInstance)
+ {
+
+ }
+
+}
Property changes on: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/MockCreationalContext.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/NeueStadt.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/NeueStadt.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/NeueStadt.java 2009-04-18 00:25:35 UTC (rev 2506)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
+
+import javax.ejb.Local;
+
+@Local
+public interface NeueStadt
+{
+ public void mehrBauen();
+}
Property changes on: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/NeueStadt.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/OrderProcessor.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/OrderProcessor.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/OrderProcessor.java 2009-04-18 00:25:35 UTC (rev 2506)
@@ -0,0 +1,30 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+
+public class OrderProcessor
+{
+ public static boolean postConstructCalled = false;
+
+ public static boolean preDestroyCalled = true;
+
+ @PostConstruct
+ public void postConstruct()
+ {
+ postConstructCalled = true;
+ }
+
+ @PreDestroy
+ public void preDestroy()
+ {
+ preDestroyCalled = true;
+ }
+
+ public void order()
+ {
+
+ }
+
+
+}
Property changes on: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/OrderProcessor.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/OrderProcessorLocal.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/OrderProcessorLocal.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/OrderProcessorLocal.java 2009-04-18 00:25:35 UTC (rev 2506)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
+
+import javax.ejb.Local;
+
+@Local
+public interface OrderProcessorLocal
+{
+ void order();
+}
Property changes on: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/OrderProcessorLocal.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/RoemerPassage.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/RoemerPassage.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/RoemerPassage.java 2009-04-18 00:25:35 UTC (rev 2506)
@@ -0,0 +1,11 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
+
+class RoemerPassage
+{
+ public final static String name = "RoemerPassage";
+
+ public String getName()
+ {
+ return name;
+ }
+}
Property changes on: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/RoemerPassage.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Schloss.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Schloss.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Schloss.java 2009-04-18 00:25:35 UTC (rev 2506)
@@ -0,0 +1,11 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
+
+import javax.ejb.Local;
+
+@Local
+public interface Schloss
+{
+ public void destructionCallback();
+
+ public void remove();
+}
Property changes on: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Schloss.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/SchoeneStadt.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/SchoeneStadt.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/SchoeneStadt.java 2009-04-18 00:25:35 UTC (rev 2506)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
+
+import javax.ejb.Local;
+
+@Local
+public interface SchoeneStadt
+{
+
+}
Property changes on: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/SchoeneStadt.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/UniStadt.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/UniStadt.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/UniStadt.java 2009-04-18 00:25:35 UTC (rev 2506)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
+
+import javax.ejb.Local;
+
+@Local
+public interface UniStadt
+{
+ public void removeBean();
+}
Property changes on: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/UniStadt.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: ri/trunk/tests/unit-tests.xml
===================================================================
--- ri/trunk/tests/unit-tests.xml 2009-04-18 00:17:35 UTC (rev 2505)
+++ ri/trunk/tests/unit-tests.xml 2009-04-18 00:25:35 UTC (rev 2506)
@@ -41,6 +41,7 @@
</run>
</groups>
<packages>
+<!-- <package name="org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle" />-->
<package name="org.jboss.webbeans.test.examples" />
<package name="org.jboss.webbeans.test.unit.bootstrap" />
<package name="org.jboss.webbeans.test.unit.bootstrap.ordering" />
16 years, 12 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2505 - in ri/trunk: impl/src/main/java/org/jboss/webbeans/context and 5 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-04-17 20:17:35 -0400 (Fri, 17 Apr 2009)
New Revision: 2505
Added:
ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Singleton.java
ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/SingletonProvider.java
ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/IsolatedStaticSingletonProvider.java
ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/TCCLSingletonProvider.java
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/CurrentManager.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ApplicationContext.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextLifecycle.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ConversationContext.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/context/RequestContext.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/WebBeansListener.java
Log:
WBRI-190, thanks to Sahoo
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/CurrentManager.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/CurrentManager.java 2009-04-17 18:35:02 UTC (rev 2504)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/CurrentManager.java 2009-04-18 00:17:35 UTC (rev 2505)
@@ -1,4 +1,10 @@
/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Use is subject to license terms.
+ *
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
@@ -9,7 +15,7 @@
* 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,
+ * 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.
@@ -20,24 +26,33 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import javax.inject.TypeLiteral;
+import org.jboss.webbeans.bootstrap.api.Singleton;
+import org.jboss.webbeans.bootstrap.api.SingletonProvider;
+
+
/**
* Access point for getting/setting current Managager
*
* @author Gavin King
+ * @author Sanjeeb.Sahoo(a)Sun.COM
+ * @author Pete Muir
*/
public class CurrentManager
{
+
+ private static class IntegerMaangerImplMap extends TypeLiteral<Map<Integer, ManagerImpl>> {}
// The root manager instance
- private static ManagerImpl rootManager;
+ private static Singleton<ManagerImpl> rootManager = SingletonProvider.instance().create(ManagerImpl.class);
- private final static Map<Integer, ManagerImpl> managers = new ConcurrentHashMap<Integer, ManagerImpl>();
+ private final static Singleton<Map<Integer, ManagerImpl>> managers = SingletonProvider.instance().create(new IntegerMaangerImplMap().getRawType());
public static void cleanup()
{
- rootManager = null;
- managers.clear();
+ rootManager.set(null);
+ managers.get().clear();
}
/**
@@ -47,7 +62,7 @@
*/
public static ManagerImpl rootManager()
{
- return rootManager;
+ return rootManager.get();
}
/**
@@ -57,19 +72,23 @@
*/
public static void setRootManager(ManagerImpl managerImpl)
{
- rootManager = managerImpl;
- managers.put(managerImpl.getId(), managerImpl);
+ rootManager.set(managerImpl);
+ if (managers.get() == null)
+ {
+ managers.set(new ConcurrentHashMap<Integer, ManagerImpl>());
+ }
+ managers.get().put(managerImpl.getId(), managerImpl);
}
public static ManagerImpl get(Integer key)
{
- return managers.get(key);
+ return managers.get().get(key);
}
public static Integer add(ManagerImpl manager)
{
Integer id = manager.getId();
- managers.put(id, manager);
+ managers.get().put(id, manager);
return id;
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ApplicationContext.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ApplicationContext.java 2009-04-17 18:35:02 UTC (rev 2504)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ApplicationContext.java 2009-04-18 00:17:35 UTC (rev 2505)
@@ -1,4 +1,10 @@
/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Use is subject to license terms.
+ *
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
@@ -21,6 +27,8 @@
import javax.context.ApplicationScoped;
+import org.jboss.webbeans.bootstrap.api.Singleton;
+import org.jboss.webbeans.bootstrap.api.SingletonProvider;
import org.jboss.webbeans.context.api.BeanStore;
/**
@@ -33,17 +41,18 @@
public class ApplicationContext extends AbstractMapContext
{
- private static ApplicationContext INSTANCE;
-
+ private static Singleton<ApplicationContext> INSTANCE = SingletonProvider.instance().create(ApplicationContext.class);
+
public static ApplicationContext instance()
{
- return INSTANCE;
+ return INSTANCE.get();
}
public static ApplicationContext create()
{
- INSTANCE = new ApplicationContext();
- return instance();
+ ApplicationContext context = new ApplicationContext();
+ INSTANCE.set(context);
+ return context;
}
// The beans
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextLifecycle.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextLifecycle.java 2009-04-17 18:35:02 UTC (rev 2504)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextLifecycle.java 2009-04-18 00:17:35 UTC (rev 2505)
@@ -1,6 +1,31 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Use is subject to license terms.
+ *
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed 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.jboss.webbeans.context;
import org.jboss.webbeans.CurrentManager;
+import org.jboss.webbeans.bootstrap.api.Singleton;
+import org.jboss.webbeans.bootstrap.api.SingletonProvider;
import org.jboss.webbeans.context.api.BeanStore;
import org.jboss.webbeans.conversation.ConversationManager;
import org.jboss.webbeans.log.LogProvider;
@@ -17,16 +42,16 @@
public class ContextLifecycle
{
- private static ContextLifecycle instance;
+ private static Singleton<ContextLifecycle> instance = SingletonProvider.instance().create(ContextLifecycle.class);
public static ContextLifecycle instance()
{
- return instance;
+ return instance.get();
}
protected static void setInstance(ContextLifecycle instance)
{
- ContextLifecycle.instance = instance;
+ ContextLifecycle.instance.set(instance);
}
private static LogProvider log = Logging.getLogProvider(ContextLifecycle.class);
@@ -69,8 +94,8 @@
protected void restoreConversation(String id, BeanStore conversationBeanStore)
{
log.trace("Starting conversation " + id);
- ConversationContext.INSTANCE.setBeanStore(conversationBeanStore);
- ConversationContext.INSTANCE.setActive(true);
+ ConversationContext.instance().setBeanStore(conversationBeanStore);
+ ConversationContext.instance().setActive(true);
}
protected void destroyConversation(String id, ConversationBeanStore conversationBeanStore)
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ConversationContext.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ConversationContext.java 2009-04-17 18:35:02 UTC (rev 2504)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ConversationContext.java 2009-04-18 00:17:35 UTC (rev 2505)
@@ -1,4 +1,10 @@
/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Use is subject to license terms.
+ *
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
@@ -9,7 +15,7 @@
* 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,
+ * 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.
@@ -21,6 +27,8 @@
import org.jboss.webbeans.log.LogProvider;
import org.jboss.webbeans.log.Logging;
+import org.jboss.webbeans.bootstrap.api.Singleton;
+import org.jboss.webbeans.bootstrap.api.SingletonProvider;
/**
* The conversation context
@@ -31,12 +39,19 @@
{
private static LogProvider log = Logging.getLogProvider(ConversationContext.class);
- public static ConversationContext INSTANCE;
+ private static Singleton<ConversationContext> INSTANCE =
+ SingletonProvider.instance().create(ConversationContext.class);
+ public static ConversationContext instance()
+ {
+ return INSTANCE.get();
+ }
+
public static ConversationContext create()
{
- INSTANCE = new ConversationContext();
- return INSTANCE;
+ ConversationContext context = new ConversationContext();
+ INSTANCE.set(context);
+ return context;
}
/**
@@ -55,5 +70,4 @@
String beanStoreInfo = getBeanStore() == null ? "" : getBeanStore().toString();
return active + "conversation context " + beanStoreInfo;
}
-
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java 2009-04-17 18:35:02 UTC (rev 2504)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java 2009-04-18 00:17:35 UTC (rev 2505)
@@ -1,4 +1,10 @@
/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Use is subject to license terms.
+ *
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
@@ -9,7 +15,7 @@
* 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,
+ * 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.
@@ -24,6 +30,9 @@
import javax.context.CreationalContext;
import javax.context.Dependent;
+import org.jboss.webbeans.bootstrap.api.Singleton;
+import org.jboss.webbeans.bootstrap.api.SingletonProvider;
+
/**
* The dependent context
*
@@ -31,17 +40,18 @@
*/
public class DependentContext extends AbstractContext
{
- private static DependentContext INSTANCE;
+ private static Singleton<DependentContext> INSTANCE = SingletonProvider.instance().create(DependentContext.class);
public static DependentContext instance()
{
- return INSTANCE;
+ return INSTANCE.get();
}
public static DependentContext create()
{
- INSTANCE = new DependentContext();
- return instance();
+ DependentContext ctx = new DependentContext();
+ INSTANCE.set(ctx);
+ return ctx;
}
private final ThreadLocal<AtomicInteger> reentrantActiveCount;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/RequestContext.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/RequestContext.java 2009-04-17 18:35:02 UTC (rev 2504)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/RequestContext.java 2009-04-18 00:17:35 UTC (rev 2505)
@@ -1,4 +1,10 @@
/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Use is subject to license terms.
+ *
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
@@ -9,7 +15,7 @@
* 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,
+ * 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.
@@ -19,6 +25,9 @@
import javax.context.RequestScoped;
+import org.jboss.webbeans.bootstrap.api.Singleton;
+import org.jboss.webbeans.bootstrap.api.SingletonProvider;
+
/**
* The request context
*
@@ -27,17 +36,18 @@
public class RequestContext extends AbstractThreadLocalMapContext
{
- private static RequestContext INSTANCE;
-
+ private static Singleton<RequestContext> INSTANCE = SingletonProvider.instance().create(RequestContext.class);
+
public static RequestContext instance()
{
- return INSTANCE;
+ return INSTANCE.get();
}
public static RequestContext create()
{
- INSTANCE = new RequestContext();
- return instance();
+ RequestContext context = new RequestContext();
+ INSTANCE.set(context);
+ return context;
}
/**
@@ -61,5 +71,5 @@
{
return false;
}
-
+
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java 2009-04-17 18:35:02 UTC (rev 2504)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java 2009-04-18 00:17:35 UTC (rev 2505)
@@ -1,4 +1,10 @@
/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Use is subject to license terms.
+ *
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
@@ -9,7 +15,7 @@
* 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,
+ * 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.
@@ -19,6 +25,8 @@
import javax.context.SessionScoped;
+import org.jboss.webbeans.bootstrap.api.Singleton;
+import org.jboss.webbeans.bootstrap.api.SingletonProvider;
import org.jboss.webbeans.log.LogProvider;
import org.jboss.webbeans.log.Logging;
@@ -31,17 +39,18 @@
{
private static LogProvider log = Logging.getLogProvider(SessionContext.class);
- private static SessionContext INSTANCE;
+ private static Singleton<SessionContext> INSTANCE = SingletonProvider.instance().create(SessionContext.class);
public static SessionContext instance()
{
- return INSTANCE;
+ return INSTANCE.get();
}
public static SessionContext create()
{
- INSTANCE = new SessionContext();
- return instance();
+ SessionContext context = new SessionContext();
+ INSTANCE.set(context);
+ return context;
}
/**
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java 2009-04-17 18:35:02 UTC (rev 2504)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java 2009-04-18 00:17:35 UTC (rev 2505)
@@ -1,4 +1,10 @@
/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Use is subject to license terms.
+ *
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
@@ -9,7 +15,7 @@
* 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,
+ * 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.
@@ -196,7 +202,7 @@
longRunningConversation.cancelTermination();
longRunningConversation.unlock();
}
- ConversationContext.INSTANCE.destroy();
+ ConversationContext.instance().destroy();
}
// If the conversation has been switched from one long
// running-conversation to another with
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java 2009-04-17 18:35:02 UTC (rev 2504)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java 2009-04-18 00:17:35 UTC (rev 2505)
@@ -1,4 +1,10 @@
/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Use is subject to license terms.
+ *
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
@@ -9,7 +15,7 @@
* 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,
+ * 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.
@@ -113,8 +119,8 @@
CurrentManager.rootManager().getInstanceByType(HttpSessionManager.class).setSession(session);
CurrentManager.rootManager().getInstanceByType(ConversationManager.class).beginOrRestoreConversation(PhaseHelper.getConversationId());
String cid = CurrentManager.rootManager().getInstanceByType(Conversation.class).getId();
- ConversationContext.INSTANCE.setBeanStore(new ConversationBeanStore(session, cid));
- ConversationContext.INSTANCE.setActive(true);
+ ConversationContext.instance().setBeanStore(new ConversationBeanStore(session, cid));
+ ConversationContext.instance().setActive(true);
}
/**
@@ -124,7 +130,7 @@
{
log.trace("In after render reponse phase");
CurrentManager.rootManager().getInstanceByType(ConversationManager.class).cleanupConversation();
- ConversationContext.INSTANCE.setActive(false);
+ ConversationContext.instance().setActive(false);
}
public PhaseId getPhaseId()
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2009-04-17 18:35:02 UTC (rev 2504)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2009-04-18 00:17:35 UTC (rev 2505)
@@ -1,4 +1,10 @@
/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Use is subject to license terms.
+ *
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
@@ -9,7 +15,7 @@
* 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,
+ * 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.
@@ -41,9 +47,12 @@
public static final String REQUEST_ATTRIBUTE_NAME = ServletLifecycle.class.getName() + ".requestBeanStore";
- static
+ // This is a temporray solution. We should remove the static field from
+ // ContextLifecycle and just tie the lifecycle of ContextLifecycle
+ // with that of manager.
+ public ServletLifecycle()
{
- ContextLifecycle.setInstance(new ServletLifecycle());
+ ContextLifecycle.setInstance(this);
}
public static ServletLifecycle instance()
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/WebBeansListener.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/WebBeansListener.java 2009-04-17 18:35:02 UTC (rev 2504)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/WebBeansListener.java 2009-04-18 00:17:35 UTC (rev 2505)
@@ -1,4 +1,10 @@
/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Use is subject to license terms.
+ *
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
@@ -9,7 +15,7 @@
* 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,
+ * 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.
@@ -40,7 +46,7 @@
public WebBeansListener()
{
- lifecycle = ServletLifecycle.instance();
+ lifecycle = new ServletLifecycle();
}
/**
Added: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Singleton.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Singleton.java (rev 0)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Singleton.java 2009-04-18 00:17:35 UTC (rev 2505)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed 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.jboss.webbeans.bootstrap.api;
+
+/**
+ * Holds a reference to an application singleton. This singleton is used
+ * internally by Web Beans to store various application scoped objects.
+ *
+ * This allows Web Beans to operate as a shared library. In a shared mode, the
+ * same instance of WebBeans implementation is used by all the applications in
+ * a server environment. In the exclusive mode, each application loads a
+ * separate copy of WebBeans implementation at the application level.
+ *
+ * Alternative implementations of Singleton can be used as required
+ *
+ * @see SingletonProvider
+ * @author Sanjeeb.Sahoo(a)Sun.COM
+ * @author Pete Muir
+ */
+public interface Singleton<T>
+{
+ /**
+ * Access the singleton
+ *
+ * @return a singleton object
+ */
+ public T get();
+
+ /**
+ * Store a singleton
+ *
+ * @param object the object to store
+ */
+ public void set(T object);
+}
Property changes on: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Singleton.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/SingletonProvider.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/SingletonProvider.java (rev 0)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/SingletonProvider.java 2009-04-18 00:17:35 UTC (rev 2505)
@@ -0,0 +1,118 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed 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.jboss.webbeans.bootstrap.api;
+
+import org.jboss.webbeans.bootstrap.api.helpers.IsolatedStaticSingletonProvider;
+import org.jboss.webbeans.bootstrap.api.helpers.TCCLSingletonProvider;
+
+/**
+ * A provider of {@link Singleton}s
+ *
+ * @see IsolatedStaticSingletonProvider
+ * @see TCCLSingletonProvider
+ *
+ * @author Sanjeeb.Sahoo(a)Sun.COM
+ * @author Pete Muir
+ */
+public abstract class SingletonProvider
+{
+ /*
+ * Singleton pattern. Upon first access (see instance()), it initializes
+ * itself by a default implementation. Containers are free to explicitly
+ * initialize it by calling initialize() method.
+ */
+ private static volatile SingletonProvider INSTANCE;
+
+ private static final String DEFAULT_SCOPE_FACTORY = IsolatedStaticSingletonProvider.class.getName();
+
+ public static SingletonProvider instance()
+ {
+ if (INSTANCE == null)
+ {
+ synchronized (SingletonProvider.class)
+ {
+ if (INSTANCE == null)
+ {
+ /*
+ * TODO: We should discover ScopeFactory implementation using
+ * Service Provider Mechanism. In the absence of any explicitly
+ * configured service, should we default to the default
+ * implementation.
+ */
+ initializeWithDefaultScope();
+ }
+ }
+ }
+ return INSTANCE;
+ }
+
+ protected SingletonProvider()
+ {
+ }
+
+ /**
+ * Create a new singleton
+ *
+ * @param expectedType represents the type of Java object stored in the singleton
+ * @return a singelton
+ */
+ public abstract <T> Singleton<T> create(Class<? extends T> expectedType);
+
+ /**
+ * Initialize with the default instance
+ */
+ private static void initializeWithDefaultScope()
+ {
+ try
+ {
+ Class<?> aClass = Class.forName(DEFAULT_SCOPE_FACTORY);
+ INSTANCE = (SingletonProvider) aClass.newInstance();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ /**
+ * Initialize with an explicit instance
+ *
+ * @param instance
+ */
+ public static void initialize(SingletonProvider instance)
+ {
+ synchronized (SingletonProvider.class)
+ {
+ if (INSTANCE == null)
+ {
+ INSTANCE = instance;
+ }
+ else
+ {
+ throw new RuntimeException("ScopeFactory is already initialized with " + INSTANCE);
+ }
+ }
+ }
+
+}
Property changes on: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/SingletonProvider.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/IsolatedStaticSingletonProvider.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/IsolatedStaticSingletonProvider.java (rev 0)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/IsolatedStaticSingletonProvider.java 2009-04-18 00:17:35 UTC (rev 2505)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed 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.jboss.webbeans.bootstrap.api.helpers;
+
+import org.jboss.webbeans.bootstrap.api.Singleton;
+import org.jboss.webbeans.bootstrap.api.SingletonProvider;
+
+/**
+ *
+ * A singleton provider that assumes an isolated classloder per application
+ *
+ * @author Sanjeeb.Sahoo(a)Sun.COM
+ * @author Pete Muir
+ */
+public class IsolatedStaticSingletonProvider extends SingletonProvider
+{
+
+ @Override
+ public <T> Singleton<T> create(Class<? extends T> type)
+ {
+ return new IsolatedStaticSingleton<T>();
+ }
+
+ private static class IsolatedStaticSingleton<T> implements Singleton<T>
+ {
+ private T object;
+
+ public T get()
+ {
+ return object;
+ }
+
+ public void set(T object)
+ {
+ this.object = object;
+ }
+ }
+}
Property changes on: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/IsolatedStaticSingletonProvider.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/TCCLSingletonProvider.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/TCCLSingletonProvider.java (rev 0)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/TCCLSingletonProvider.java 2009-04-18 00:17:35 UTC (rev 2505)
@@ -0,0 +1,84 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed 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.jboss.webbeans.bootstrap.api.helpers;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Hashtable;
+import java.util.Map;
+
+import org.jboss.webbeans.bootstrap.api.Singleton;
+import org.jboss.webbeans.bootstrap.api.SingletonProvider;
+
+/**
+ * Singleton provider that uses the Thread Context ClassLoader to differentiate
+ * between applications
+ *
+ * @author Sanjeeb.Sahoo(a)Sun.COM
+ * @author Pete Muir
+ */
+public class TCCLSingletonProvider extends SingletonProvider
+{
+
+ @Override
+ public <T> Singleton<T> create(Class<? extends T> type)
+ {
+ return new TCCLSingleton<T>();
+ }
+
+ private static class TCCLSingleton<T> implements Singleton<T>
+ {
+ // use Hashtable for concurrent access
+ private final Map<ClassLoader, T> store = new Hashtable<ClassLoader, T>();
+
+ public T get()
+ {
+ return store.get(getClassLoader());
+ }
+
+ public void set(T object)
+ {
+ store.put(getClassLoader(), object);
+ }
+
+ private ClassLoader getClassLoader()
+ {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null)
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
+ {
+ public ClassLoader run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
+ else
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ }
+ }
+}
Property changes on: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/TCCLSingletonProvider.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 12 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2504 - ri/trunk.
by webbeans-commits＠lists.jboss.org
Author: rogerk
Date: 2009-04-17 14:35:02 -0400 (Fri, 17 Apr 2009)
New Revision: 2504
Modified:
ri/trunk/pom.xml
Log:
test commit
Modified: ri/trunk/pom.xml
===================================================================
--- ri/trunk/pom.xml 2009-04-17 18:30:45 UTC (rev 2503)
+++ ri/trunk/pom.xml 2009-04-17 18:35:02 UTC (rev 2504)
@@ -20,7 +20,7 @@
<distributionManagement>
<repository>
<!--
- Copy the dist to the local checkout of the JBoss maven2 repo
+ Copy the dist to the local checkout of the JBoss maven2 repo
${maven.repository.root}
-->
<!--
@@ -73,6 +73,7 @@
<module>tests</module>
<module>porting-package</module>
<module>jboss-tck-runner</module>
+ <module>osgi-bundle</module>
</modules>
</profile>
</profiles>
16 years, 12 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2503 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext and 2 other directories.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-04-17 14:30:45 -0400 (Fri, 17 Apr 2009)
New Revision: 2503
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/DeclarationOfEjbTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/DeclarationOfPersistenceUnitAndContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/DeclarationOfResourceTest.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/InjectionOfPersistenceContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/InjectionOfResourceTest.java
Modified:
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/beans.xml
Log:
Renamed tests to better reflect what they do and some spec assertion assignment fixes
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/DeclarationOfEjbTest.java (from rev 2474, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/DeclarationOfEjbTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/DeclarationOfEjbTest.java 2009-04-17 18:30:45 UTC (rev 2503)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed 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.jboss.jsr299.tck.tests.xml.resource.ejb;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.testharness.impl.packaging.Resource;
+import org.jboss.testharness.impl.packaging.Resources;
+import org.jboss.testharness.impl.packaging.ear.EjbJarXml;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+/**
+ * Simple lifecycle test with XML declaring injection of EJB.
+ *
+ * @author David Allen
+ *
+ */
+@Artifact
+(a)Packaging(PackagingType.EAR)
+@IntegrationTest
+@Resources({
+ @Resource(source="web.xml", destination="WEB-INF/web.xml")
+})
+@BeansXml("beans.xml")
+@EjbJarXml("ejb-jar.xml")
+public class DeclarationOfEjbTest extends AbstractJSR299Test
+{
+ @Test(groups = { "xml" })
+ @SpecAssertions( {
+ @SpecAssertion(section = "6.9", id = "i"),
+ @SpecAssertion(section = "3.6", id = "d"),
+ @SpecAssertion(section = "3.6.1", id = "d"),
+ @SpecAssertion(section = "3.6.1", id = "i")
+ })
+ public void testXMLDeclarationOfEjb()
+ {
+ RemoteEjbInterface remoteEjbInterface = getCurrentManager().getInstanceByType(RemoteEjbInterface.class);
+ assert remoteEjbInterface.hello().equals("hi!");
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/DeclarationOfEjbTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java 2009-04-17 18:24:02 UTC (rev 2502)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java 2009-04-17 18:30:45 UTC (rev 2503)
@@ -1,62 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed 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.jboss.jsr299.tck.tests.xml.resource.ejb;
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.hibernate.tck.annotations.SpecAssertions;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.IntegrationTest;
-import org.jboss.testharness.impl.packaging.Packaging;
-import org.jboss.testharness.impl.packaging.PackagingType;
-import org.jboss.testharness.impl.packaging.Resource;
-import org.jboss.testharness.impl.packaging.Resources;
-import org.jboss.testharness.impl.packaging.ear.EjbJarXml;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.testng.annotations.Test;
-
-/**
- * Simple lifecycle test with XML declaring injection of EJB.
- *
- * @author David Allen
- *
- */
-@Artifact
-(a)Packaging(PackagingType.EAR)
-@IntegrationTest
-@Resources({
- @Resource(source="web.xml", destination="WEB-INF/web.xml")
-})
-@BeansXml("beans.xml")
-@EjbJarXml("ejb-jar.xml")
-public class InjectionOfEjbTest extends AbstractJSR299Test
-{
- @Test(groups = { "xml" })
- @SpecAssertions( {
- @SpecAssertion(section = "6.9", id = "i"),
- @SpecAssertion(section = "3.6", id = "d"),
- @SpecAssertion(section = "3.6", id = "i"),
- @SpecAssertion(section = "3.6.1", id = "d"),
- @SpecAssertion(section = "3.6.1", id = "i")
- })
- public void testEjbInjectionByXml()
- {
- RemoteEjbInterface remoteEjbInterface = getCurrentManager().getInstanceByType(RemoteEjbInterface.class);
- assert remoteEjbInterface.hello().equals("hi!");
- }
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/DeclarationOfPersistenceUnitAndContextTest.java (from rev 2474, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/InjectionOfPersistenceContextTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/DeclarationOfPersistenceUnitAndContextTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/DeclarationOfPersistenceUnitAndContextTest.java 2009-04-17 18:30:45 UTC (rev 2503)
@@ -0,0 +1,54 @@
+package org.jboss.jsr299.tck.tests.xml.resource.persistenceContext;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.testharness.impl.packaging.Resource;
+import org.jboss.testharness.impl.packaging.Resources;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)Packaging(PackagingType.WAR)
+@IntegrationTest
+@Resources({
+ @Resource(source="persistence.xml", destination="WEB-INF/persistence.xml")
+})
+@BeansXml("beans.xml")
+public class DeclarationOfPersistenceUnitAndContextTest extends AbstractJSR299Test
+{
+ @Test(groups = { "xml" })
+ @SpecAssertions( {
+ @SpecAssertion(section = "6.9", id = "g"),
+ @SpecAssertion(section = "3.6", id = "b"),
+ @SpecAssertion(section = "3.6.1", id = "b"),
+ @SpecAssertion(section = "3.6.1", id = "g")
+ })
+ public void testXMLDeclarationOfPersistenceContext()
+ {
+ EntityManager entityManager = getCurrentManager().getInstanceByType(EntityManager.class);
+ assert entityManager != null : "Persistence context was not injected into bean";
+ assert entityManager.isOpen() : "persistence context not open injected into bean";
+ }
+
+ @Test(groups = { "xml" })
+ @SpecAssertions( {
+ @SpecAssertion(section = "6.9", id = "h"),
+ @SpecAssertion(section = "3.6", id = "c"),
+ @SpecAssertion(section = "3.6.1", id = "c"),
+ @SpecAssertion(section = "3.6.1", id = "h")
+ })
+ public void testDeclarationOfPersistenceUnit()
+ {
+ EntityManagerFactory entityManagerFactory = getCurrentManager().getInstanceByType(EntityManagerFactory.class);
+ assert entityManagerFactory != null : "Persistence unit was not injected into bean";
+ assert entityManagerFactory.isOpen() : "persistence unit not open injected into bean";
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/DeclarationOfPersistenceUnitAndContextTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/InjectionOfPersistenceContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/InjectionOfPersistenceContextTest.java 2009-04-17 18:24:02 UTC (rev 2502)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/InjectionOfPersistenceContextTest.java 2009-04-17 18:30:45 UTC (rev 2503)
@@ -1,56 +0,0 @@
-package org.jboss.jsr299.tck.tests.xml.resource.persistenceContext;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.hibernate.tck.annotations.SpecAssertions;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.IntegrationTest;
-import org.jboss.testharness.impl.packaging.Packaging;
-import org.jboss.testharness.impl.packaging.PackagingType;
-import org.jboss.testharness.impl.packaging.Resource;
-import org.jboss.testharness.impl.packaging.Resources;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.testng.annotations.Test;
-
-@Artifact
-(a)Packaging(PackagingType.WAR)
-@IntegrationTest
-@Resources({
- @Resource(source="persistence.xml", destination="WEB-INF/persistence.xml")
-})
-@BeansXml("beans.xml")
-public class InjectionOfPersistenceContextTest extends AbstractJSR299Test
-{
- @Test(groups = { "xml" })
- @SpecAssertions( {
- @SpecAssertion(section = "6.9", id = "g"),
- @SpecAssertion(section = "3.6", id = "b"),
- @SpecAssertion(section = "3.6", id = "g"),
- @SpecAssertion(section = "3.6.1", id = "b"),
- @SpecAssertion(section = "3.6.1", id = "g")
- })
- public void testInjectionOfPersistenceContext()
- {
- EntityManager entityManager = getCurrentManager().getInstanceByType(EntityManager.class);
- assert entityManager != null : "Persistence context was not injected into bean";
- assert entityManager.isOpen() : "persistence context not open injected into bean";
- }
-
- @Test(groups = { "xml" })
- @SpecAssertions( {
- @SpecAssertion(section = "6.9", id = "h"),
- @SpecAssertion(section = "3.6", id = "c"),
- @SpecAssertion(section = "3.6", id = "h"),
- @SpecAssertion(section = "3.6.1", id = "c"),
- @SpecAssertion(section = "3.6.1", id = "h")
- })
- public void testInjectionOfPersistenceUnit()
- {
- EntityManagerFactory entityManagerFactory = getCurrentManager().getInstanceByType(EntityManagerFactory.class);
- assert entityManagerFactory != null : "Persistence unit was not injected into bean";
- assert entityManagerFactory.isOpen() : "persistence unit not open injected into bean";
- }
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/DeclarationOfResourceTest.java (from rev 2474, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/InjectionOfResourceTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/DeclarationOfResourceTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/DeclarationOfResourceTest.java 2009-04-17 18:30:45 UTC (rev 2503)
@@ -0,0 +1,36 @@
+package org.jboss.jsr299.tck.tests.xml.resource.resource;
+
+import javax.inject.AnnotationLiteral;
+import javax.inject.manager.Manager;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)Packaging(PackagingType.WAR)
+@IntegrationTest
+@BeansXml("beans.xml")
+public class DeclarationOfResourceTest extends AbstractJSR299Test
+{
+ @Test(groups = { "xml" })
+ @SpecAssertions( {
+ @SpecAssertion(section = "6.9", id = "f"),
+ @SpecAssertion(section = "3.6", id = "a"),
+ @SpecAssertion(section = "3.6.1", id = "a"),
+ @SpecAssertion(section = "3.6.1", id = "f"),
+ @SpecAssertion(section = "3.6.1", id = "l")
+ })
+ public void testXMLDeclarationOfResource()
+ {
+ Manager manager = getCurrentManager().getInstanceByType(Manager.class, new AnnotationLiteral<Another>() {});
+ assert manager != null : "@Another Manager not found";
+ assert manager.equals(getCurrentManager()): "Wrong manager found";
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/DeclarationOfResourceTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/InjectionOfResourceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/InjectionOfResourceTest.java 2009-04-17 18:24:02 UTC (rev 2502)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/InjectionOfResourceTest.java 2009-04-17 18:30:45 UTC (rev 2503)
@@ -1,36 +0,0 @@
-package org.jboss.jsr299.tck.tests.xml.resource.resource;
-
-import javax.inject.AnnotationLiteral;
-import javax.inject.manager.Manager;
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.hibernate.tck.annotations.SpecAssertions;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.IntegrationTest;
-import org.jboss.testharness.impl.packaging.Packaging;
-import org.jboss.testharness.impl.packaging.PackagingType;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.testng.annotations.Test;
-
-@Artifact
-(a)Packaging(PackagingType.WAR)
-@IntegrationTest
-@BeansXml("beans.xml")
-public class InjectionOfResourceTest extends AbstractJSR299Test
-{
- @Test(groups = { "xml" })
- @SpecAssertions( {
- @SpecAssertion(section = "6.9", id = "f"),
- @SpecAssertion(section = "3.6", id = "a"),
- @SpecAssertion(section = "3.6", id = "f"),
- @SpecAssertion(section = "3.6.1", id = "a"),
- @SpecAssertion(section = "3.6.1", id = "f")
- })
- public void testInjectionOfResource()
- {
- Manager manager = getCurrentManager().getInstanceByType(Manager.class, new AnnotationLiteral<Another>() {});
- assert manager != null : "@Another Manager was not injected into bean";
- assert manager.equals(getCurrentManager()): "Wrong manager injected into bean";
- }
-}
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/beans.xml 2009-04-17 18:24:02 UTC (rev 2502)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/beans.xml 2009-04-17 18:30:45 UTC (rev 2503)
@@ -6,7 +6,7 @@
</Deploy>
<test:RemoteEjbInterface>
<EJB>
- <mappedName>org.jboss.jsr299.tck.tests.xml.resource.ejb.InjectionOfEjbTest/MyRemoteEjb/remote-org.jboss.jsr299.tck.tests.xml.resource.ejb.RemoteEjbInterface</mappedName>
+ <mappedName>ejb/MyRemoteEjb</mappedName>
</EJB>
</test:RemoteEjbInterface>
</Beans>
16 years, 12 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2501 - in ri/trunk: parent and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-04-17 14:12:11 -0400 (Fri, 17 Apr 2009)
New Revision: 2501
Modified:
ri/trunk/api/pom.xml
ri/trunk/parent/pom.xml
ri/trunk/version-matrix/pom.xml
Log:
restore versions for development
Modified: ri/trunk/api/pom.xml
===================================================================
--- ri/trunk/api/pom.xml 2009-04-17 17:26:13 UTC (rev 2500)
+++ ri/trunk/api/pom.xml 2009-04-17 18:12:11 UTC (rev 2501)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-parent</artifactId>
- <version>1.0.0.PREVIEW1</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.webbeans</groupId>
Modified: ri/trunk/parent/pom.xml
===================================================================
--- ri/trunk/parent/pom.xml 2009-04-17 17:26:13 UTC (rev 2500)
+++ ri/trunk/parent/pom.xml 2009-04-17 18:12:11 UTC (rev 2501)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-version-matrix</artifactId>
- <version>1.0.0.PREVIEW1</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<name>Web Beans, the reference implmentation of JSR-299</name>
Modified: ri/trunk/version-matrix/pom.xml
===================================================================
--- ri/trunk/version-matrix/pom.xml 2009-04-17 17:26:13 UTC (rev 2500)
+++ ri/trunk/version-matrix/pom.xml 2009-04-17 18:12:11 UTC (rev 2501)
@@ -48,9 +48,9 @@
<properties>
<jsr299.tck.version>1.0.0.BETA2</jsr299.tck.version>
- <webbeans.version>1.0.0.PREVIEW1</webbeans.version>
- <webbeans.servlet.version>1.0.0.CR1</webbeans.servlet.version>
- <webbeans.se.version>1.0.0.BETA1</webbeans.se.version>
+ <webbeans.version>1.0.0-SNAPSHOT</webbeans.version>
+ <webbeans.servlet.version>1.0.0-SNAPSHOT</webbeans.servlet.version>
+ <webbeans.se.version>1.0.0-SNAPSHOT</webbeans.se.version>
<jboss.test.harness.version>1.0.0.BETA2</jboss.test.harness.version>
</properties>
@@ -225,7 +225,7 @@
<dependency>
<groupId>org.jboss.webbeans</groupId>
<artifactId>jsr299-api</artifactId>
- <version>${webbeans.version}</version>
+ <version>1.0.0.PREVIEW1</version>
</dependency>
<dependency>
16 years, 12 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2500 - in tck/trunk: api and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-04-17 13:26:13 -0400 (Fri, 17 Apr 2009)
New Revision: 2500
Modified:
tck/trunk/api/pom.xml
tck/trunk/impl/pom.xml
tck/trunk/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: tck/trunk/api/pom.xml
===================================================================
--- tck/trunk/api/pom.xml 2009-04-17 17:26:06 UTC (rev 2499)
+++ tck/trunk/api/pom.xml 2009-04-17 17:26:13 UTC (rev 2500)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>parent</artifactId>
- <version>1.0.0.BETA2</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.jsr299.tck</groupId>
Modified: tck/trunk/impl/pom.xml
===================================================================
--- tck/trunk/impl/pom.xml 2009-04-17 17:26:06 UTC (rev 2499)
+++ tck/trunk/impl/pom.xml 2009-04-17 17:26:13 UTC (rev 2500)
@@ -3,7 +3,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.jboss.jsr299.tck</groupId>
- <version>1.0.0.BETA2</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.jsr299.tck</groupId>
Modified: tck/trunk/pom.xml
===================================================================
--- tck/trunk/pom.xml 2009-04-17 17:26:06 UTC (rev 2499)
+++ tck/trunk/pom.xml 2009-04-17 17:26:13 UTC (rev 2500)
@@ -4,7 +4,7 @@
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.0.BETA2</version>
+ <version>1.0.0-SNAPSHOT</version>
<name>JSR-299 TCK</name>
<url>http://www.seamframework.org/WebBeans</url>
@@ -362,11 +362,11 @@
</licenses>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/1.0.0.BETA2</connection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans</connection>
<developerConnection>
- scm:svn:https://svn.jboss.org/repos/webbeans/tck/tags/1.0.0.BETA2
+ scm:svn:https://svn.jboss.org/repos/webbeans
</developerConnection>
- <url>http://fisheye.jboss.org/browse/WebBeans/1.0.0.BETA2</url>
+ <url>http://fisheye.jboss.org/browse/WebBeans</url>
</scm>
<distributionManagement>
16 years, 12 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2499 - tck/tags.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-04-17 13:26:06 -0400 (Fri, 17 Apr 2009)
New Revision: 2499
Added:
tck/tags/1.0.0.BETA2/
Log:
[maven-release-plugin] copy for tag 1.0.0.BETA2
Copied: tck/tags/1.0.0.BETA2 (from rev 2498, tck/trunk)
16 years, 12 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2498 - in tck/trunk: api and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-04-17 13:25:01 -0400 (Fri, 17 Apr 2009)
New Revision: 2498
Modified:
tck/trunk/api/pom.xml
tck/trunk/impl/pom.xml
tck/trunk/pom.xml
Log:
[maven-release-plugin] prepare release 1.0.0.BETA2
Modified: tck/trunk/api/pom.xml
===================================================================
--- tck/trunk/api/pom.xml 2009-04-17 17:22:01 UTC (rev 2497)
+++ tck/trunk/api/pom.xml 2009-04-17 17:25:01 UTC (rev 2498)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.BETA2</version>
</parent>
<groupId>org.jboss.jsr299.tck</groupId>
Modified: tck/trunk/impl/pom.xml
===================================================================
--- tck/trunk/impl/pom.xml 2009-04-17 17:22:01 UTC (rev 2497)
+++ tck/trunk/impl/pom.xml 2009-04-17 17:25:01 UTC (rev 2498)
@@ -3,7 +3,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.jboss.jsr299.tck</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.BETA2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.jsr299.tck</groupId>
Modified: tck/trunk/pom.xml
===================================================================
--- tck/trunk/pom.xml 2009-04-17 17:22:01 UTC (rev 2497)
+++ tck/trunk/pom.xml 2009-04-17 17:25:01 UTC (rev 2498)
@@ -4,7 +4,7 @@
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.BETA2</version>
<name>JSR-299 TCK</name>
<url>http://www.seamframework.org/WebBeans</url>
@@ -362,11 +362,11 @@
</licenses>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans</connection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/1.0.0.BETA2</connection>
<developerConnection>
- scm:svn:https://svn.jboss.org/repos/webbeans
+ scm:svn:https://svn.jboss.org/repos/webbeans/tck/tags/1.0.0.BETA2
</developerConnection>
- <url>http://fisheye.jboss.org/browse/WebBeans</url>
+ <url>http://fisheye.jboss.org/browse/WebBeans/1.0.0.BETA2</url>
</scm>
<distributionManagement>
16 years, 12 months
- 1
- 0