[jboss-svn-commits] JBL Code SVN: r20545 - in labs/jbosslabs/labs-3.0-build: integration/seam-guice/src/main/java/org/jboss/labs/seam and 10 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jun 16 12:44:29 EDT 2008
Author: wrzep
Date: 2008-06-16 12:44:29 -0400 (Mon, 16 Jun 2008)
New Revision: 20545
Added:
labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/seam/
labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/seam/guice/
labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/seam/guice/Guice.java
labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/seam/guice/GuiceInit.java
labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/seam/guice/GuiceInterceptor.java
labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/seam/guice/Injector.java
labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/seam/guice/package-info.java
labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/resources/guice-2.1.xsd
Removed:
labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/injection/
Modified:
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/AdminEventsListener.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/ShowRequests.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/AddLicense.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/DeleteLicense.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/LicenseServiceFactory.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/LicensesFactory.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/UpdateLicense.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/AcceptProject.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/CreateProjectRequest.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ProjectManager.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ReviewProjectRequest.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/SaveProject.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ShowView.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ViewProject.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/license/UpdateProjectLicenses.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/AcceptJoin.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/JoinProject.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/MembersManager.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/UserServiceWrapper.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/auth/Authenticator.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/auth/SecurityInitializer.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/auth/SecurityManager.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/validator/EmailValidator.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/validator/UniqueProjectIdValidator.java
Log:
seam&guice - ported back changes made while creating seam trunk diff
Added: labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/seam/guice/Guice.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/seam/guice/Guice.java (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/seam/guice/Guice.java 2008-06-16 16:44:29 UTC (rev 20545)
@@ -0,0 +1,26 @@
+package org.jboss.labs.seam.guice;
+
+import org.jboss.seam.annotations.intercept.Interceptors;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Google Guice support. Allows use of Guice injection inside Seam component.
+ *
+ * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
+ */
+ at Target(TYPE)
+ at Retention(RUNTIME)
+ at Interceptors(GuiceInterceptor.class)
+public @interface Guice
+{
+ /**
+ * Name of the Guice injector component.
+ * By default the injector specified in the components.xml file is used.
+ */
+ String value() default "";
+}
+
Added: labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/seam/guice/GuiceInit.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/seam/guice/GuiceInit.java (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/seam/guice/GuiceInit.java 2008-06-16 16:44:29 UTC (rev 20545)
@@ -0,0 +1,47 @@
+package org.jboss.labs.seam.guice;
+
+
+import com.google.inject.Injector;
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Install;
+import static org.jboss.seam.annotations.Install.FRAMEWORK;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.Startup;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
+
+import java.io.Serializable;
+
+/**
+ * Guice support configuration component.
+ * Holds reference to the default injector.
+ *
+ * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
+ */
+ at Name("org.jboss.labs.seam.guice.init")
+ at Scope(ScopeType.APPLICATION)
+ at Startup
+ at Install(precedence=FRAMEWORK, classDependencies="com.google.inject.Injector")
+ at BypassInterceptors
+public class GuiceInit implements Serializable
+{
+ private static final long serialVersionUID = -1517814449129434488L;
+
+ private Injector injector;
+
+ public Injector getInjector()
+ {
+ return injector;
+ }
+
+ public void setInjector(Injector injector)
+ {
+ this.injector = injector;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "org.jboss.labs.seam.guice.init(" + injector + ")";
+ }
+}
\ No newline at end of file
Added: labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/seam/guice/GuiceInterceptor.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/seam/guice/GuiceInterceptor.java (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/seam/guice/GuiceInterceptor.java 2008-06-16 16:44:29 UTC (rev 20545)
@@ -0,0 +1,95 @@
+package org.jboss.labs.seam.guice;
+
+
+import com.google.inject.Injector;
+import org.jboss.seam.Component;
+import org.jboss.seam.core.Expressions;
+import org.jboss.seam.annotations.intercept.AroundInvoke;
+import org.jboss.seam.annotations.intercept.Interceptor;
+import org.jboss.seam.intercept.AbstractInterceptor;
+import org.jboss.seam.intercept.InvocationContext;
+import org.jboss.seam.log.Log;
+import org.jboss.seam.log.Logging;
+
+/**
+ * Triggers Guice injection on a Seam component.
+ *
+ * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
+ * @author Tomasz Szymanski (tszymanski [at] jboss.org)
+ */
+ at Interceptor
+public class GuiceInterceptor extends AbstractInterceptor
+{
+ private static final Log log = Logging.getLog(GuiceInterceptor.class);
+
+ private static final long serialVersionUID = -6716553117162905303L;
+
+ private static Injector CACHED_DEFAULT_INJECTOR = null;
+
+ @AroundInvoke
+ public Object aroundInvoke(InvocationContext invocationContext) throws Exception
+ {
+ final Injector injector = getInjectorForClass(invocationContext.getMethod().getDeclaringClass());
+
+ if (log.isTraceEnabled())
+ {
+ log.trace("Injecting members of: #0", invocationContext.getTarget().getClass().getName());
+ }
+
+ injector.injectMembers(invocationContext.getTarget());
+
+ return invocationContext.proceed();
+ }
+
+ private static Injector getInjectorForClass(final Class<?> declaringClass)
+ {
+ final String expr = declaringClass.getAnnotation(Guice.class).value();
+
+ // Optimize lookups for default injector
+ return (expr.length() == 0)
+ ? getCachedDefaultInjector()
+ : getInjectorByName(expr);
+ }
+
+ private static Injector getCachedDefaultInjector()
+ {
+ if (CACHED_DEFAULT_INJECTOR == null)
+ {
+ GuiceInit init = (GuiceInit) Component.getInstance("org.jboss.labs.seam.guice.init");
+
+ if (init != null)
+ {
+ CACHED_DEFAULT_INJECTOR = init.getInjector();
+ }
+
+ if (CACHED_DEFAULT_INJECTOR == null)
+ {
+ throw new IllegalStateException("Default Guice injector not specified.");
+ }
+ }
+
+ return CACHED_DEFAULT_INJECTOR;
+ }
+
+ public static Injector getInjectorByName(final String expr)
+ {
+ Object result;
+
+ if (expr.startsWith("#"))
+ {
+ result = Expressions.instance().createValueExpression(expr).getValue();
+ }
+ else
+ {
+ result = Component.getInstance(expr);
+ }
+
+ if (!(result instanceof Injector))
+ {
+ throw new IllegalArgumentException("Expression '" + expr +
+ "' does not evaluate to a Guice injector.");
+ }
+
+ return (Injector) result;
+ }
+}
Added: labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/seam/guice/Injector.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/seam/guice/Injector.java (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/seam/guice/Injector.java 2008-06-16 16:44:29 UTC (rev 20545)
@@ -0,0 +1,93 @@
+package org.jboss.labs.seam.guice;
+
+import com.google.inject.Guice;
+import com.google.inject.Module;
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.*;
+import static org.jboss.seam.annotations.Install.FRAMEWORK;
+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Creates Guice injector from a list of modules.
+ *
+ * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
+ */
+ at Name("org.jboss.labs.seam.guice.injector")
+ at Scope(ScopeType.APPLICATION)
+ at Startup
+ at Install(value=false, precedence = FRAMEWORK)
+public class Injector implements Serializable
+{
+ private static final long serialVersionUID = 8935525407647910950L;
+
+ private static final LogProvider log = Logging.getLogProvider(Injector.class);
+
+ private String[] modules;
+
+ private com.google.inject.Injector injector = null;
+
+ @Unwrap
+ public com.google.inject.Injector getInjector()
+ {
+ return injector;
+ }
+
+ @Create
+ public void createInjector() throws IllegalAccessException, InstantiationException, ClassNotFoundException
+ {
+ if ((modules == null) || (modules.length == 0))
+ {
+ throw new IllegalArgumentException("No Guice module specified.");
+ }
+
+ log.info("Creating injector '" +
+ "'from modules: " + Arrays.toString(modules));
+
+ final List<Module> moduleList = getModuleList(modules);
+
+ injector = Guice.createInjector(moduleList);
+ }
+
+ private static List<Module> getModuleList(String[] modules) throws IllegalAccessException, InstantiationException, ClassNotFoundException
+ {
+ List<Module> moduleList = new ArrayList<Module>();
+
+ for (String m : modules)
+ {
+ Module module = getModule(m);
+ moduleList.add(module);
+ }
+
+ return moduleList;
+ }
+
+ private static Module getModule(String className)
+ {
+ try
+ {
+ final Class<?> clazz = Class.forName(className, true, Thread.currentThread().getContextClassLoader());
+
+ return (Module) clazz.newInstance();
+ }
+ catch (Exception e)
+ {
+ throw new IllegalArgumentException("Unable to create guice module: " + className, e);
+ }
+ }
+
+ public String[] getModules()
+ {
+ return modules;
+ }
+
+ public void setModules(String[] modules)
+ {
+ this.modules = modules;
+ }
+}
Added: labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/seam/guice/package-info.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/seam/guice/package-info.java (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/java/org/jboss/labs/seam/guice/package-info.java 2008-06-16 16:44:29 UTC (rev 20545)
@@ -0,0 +1,6 @@
+ at Namespace(value="http://jboss.org/jbosslabs/seam-guice", prefix = "org.jboss.labs.seam.guice")
+ at AutoCreate
+package org.jboss.labs.seam.guice;
+
+import org.jboss.seam.annotations.Namespace;
+import org.jboss.seam.annotations.AutoCreate;
\ No newline at end of file
Added: labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/resources/guice-2.1.xsd
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/resources/guice-2.1.xsd (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/seam-guice/src/main/resources/guice-2.1.xsd 2008-06-16 16:44:29 UTC (rev 20545)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
+ targetNamespace="http://jboss.org/jbosslabs/seam-guice" xmlns:guice="http://jboss.org/jbosslabs/seam-guice"
+ xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified">
+ <xs:import namespace="http://jboss.com/products/seam/components" />
+
+ <xs:element name="init">
+ <xs:annotation>
+ <xs:documentation>Guice Support Configuration</xs:documentation>
+ </xs:annotation>
+ <xs:complexType mixed="true">
+ <xs:attributeGroup ref="guice:attlist.guiceInit"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:attributeGroup name="attlist.guiceInit">
+ <xs:attribute name="injector" type="components:string" />
+ </xs:attributeGroup>
+
+ <xs:element name="injector">
+ <xs:annotation>
+ <xs:documentation>Guice Injector</xs:documentation>
+ </xs:annotation>
+ <xs:complexType mixed="true">
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="modules" type="components:multiValuedProperty">
+ <xs:annotation>
+ <xs:documentation>A list of modules</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:choice>
+ <xs:attributeGroup ref="components:attlist.component" />
+ <xs:attributeGroup ref="guice:attlist.guiceInjector" />
+ </xs:complexType>
+ </xs:element>
+ <xs:attributeGroup name="attlist.guiceInjector" />
+
+</xs:schema>
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/AdminEventsListener.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/AdminEventsListener.java 2008-06-16 15:32:46 UTC (rev 20544)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/AdminEventsListener.java 2008-06-16 16:44:29 UTC (rev 20545)
@@ -26,7 +26,7 @@
import com.google.inject.Inject;
import org.jboss.labs.events.AdminEvents;
import org.jboss.labs.events.service.EventsService;
-import org.jboss.labs.injection.seam.Guice;
+import org.jboss.labs.seam.guice.Guice;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.*;
import org.jboss.seam.log.Log;
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/ShowRequests.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/ShowRequests.java 2008-06-16 15:32:46 UTC (rev 20544)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/ShowRequests.java 2008-06-16 16:44:29 UTC (rev 20545)
@@ -1,7 +1,7 @@
package org.jboss.labs.admin.action;
import org.jboss.labs.admin.Pages;
-import org.jboss.labs.injection.seam.Guice;
+import org.jboss.labs.seam.guice.Guice;
import org.jboss.seam.annotations.Begin;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/AddLicense.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/AddLicense.java 2008-06-16 15:32:46 UTC (rev 20544)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/AddLicense.java 2008-06-16 16:44:29 UTC (rev 20545)
@@ -26,7 +26,7 @@
import org.jboss.labs.admin.Pages;
import org.jboss.labs.core.model.License;
import org.jboss.labs.core.service.LicenseService;
-import org.jboss.labs.injection.seam.Guice;
+import org.jboss.labs.seam.guice.Guice;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.*;
import org.jboss.seam.core.Conversation;
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/DeleteLicense.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/DeleteLicense.java 2008-06-16 15:32:46 UTC (rev 20544)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/DeleteLicense.java 2008-06-16 16:44:29 UTC (rev 20545)
@@ -28,7 +28,7 @@
import org.jboss.labs.core.model.License;
import org.jboss.labs.core.service.LicenseService;
import org.jboss.labs.exception.LabsRollbackException;
-import org.jboss.labs.injection.seam.Guice;
+import org.jboss.labs.seam.guice.Guice;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.*;
import org.jboss.seam.core.Conversation;
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/LicenseServiceFactory.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/LicenseServiceFactory.java 2008-06-16 15:32:46 UTC (rev 20544)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/LicenseServiceFactory.java 2008-06-16 16:44:29 UTC (rev 20545)
@@ -23,7 +23,7 @@
package org.jboss.labs.admin.action.license;
-import org.jboss.labs.injection.seam.Guice;
+import org.jboss.labs.seam.guice.Guice;
/**
* @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/LicensesFactory.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/LicensesFactory.java 2008-06-16 15:32:46 UTC (rev 20544)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/LicensesFactory.java 2008-06-16 16:44:29 UTC (rev 20545)
@@ -25,7 +25,7 @@
import com.google.inject.Inject;
import org.jboss.labs.core.model.License;
-import org.jboss.labs.injection.seam.Guice;
+import org.jboss.labs.seam.guice.Guice;
import org.jboss.seam.annotations.Factory;
import org.jboss.seam.annotations.Name;
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/UpdateLicense.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/UpdateLicense.java 2008-06-16 15:32:46 UTC (rev 20544)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/UpdateLicense.java 2008-06-16 16:44:29 UTC (rev 20545)
@@ -26,7 +26,7 @@
import org.jboss.labs.admin.Pages;
import org.jboss.labs.core.model.License;
import org.jboss.labs.core.service.LicenseService;
-import org.jboss.labs.injection.seam.Guice;
+import org.jboss.labs.seam.guice.Guice;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.*;
import org.jboss.seam.core.Conversation;
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/AcceptProject.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/AcceptProject.java 2008-06-16 15:32:46 UTC (rev 20544)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/AcceptProject.java 2008-06-16 16:44:29 UTC (rev 20545)
@@ -32,7 +32,7 @@
import org.jboss.labs.core.model.admin.Request;
import org.jboss.labs.core.service.ProjectService;
import org.jboss.labs.exception.LabsRollbackException;
-import org.jboss.labs.injection.seam.Guice;
+import org.jboss.labs.seam.guice.Guice;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Logger;
import org.jboss.seam.annotations.Name;
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/CreateProjectRequest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/CreateProjectRequest.java 2008-06-16 15:32:46 UTC (rev 20544)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/CreateProjectRequest.java 2008-06-16 16:44:29 UTC (rev 20545)
@@ -30,7 +30,7 @@
import org.jboss.labs.core.model.auth.User;
import org.jboss.labs.core.service.LicenseService;
import org.jboss.labs.core.service.ProjectService;
-import org.jboss.labs.injection.seam.Guice;
+import org.jboss.labs.seam.guice.Guice;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Begin;
import org.jboss.seam.annotations.In;
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ProjectManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ProjectManager.java 2008-06-16 15:32:46 UTC (rev 20544)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ProjectManager.java 2008-06-16 16:44:29 UTC (rev 20545)
@@ -26,7 +26,7 @@
import com.google.inject.Inject;
import org.jboss.labs.core.model.Project;
import org.jboss.labs.core.service.ProjectService;
-import org.jboss.labs.injection.seam.Guice;
+import org.jboss.labs.seam.guice.Guice;
import org.jboss.seam.annotations.Name;
import java.util.List;
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ReviewProjectRequest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ReviewProjectRequest.java 2008-06-16 15:32:46 UTC (rev 20544)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ReviewProjectRequest.java 2008-06-16 16:44:29 UTC (rev 20545)
@@ -26,7 +26,7 @@
import org.jboss.labs.core.model.admin.ProjectRequest;
import org.jboss.labs.core.service.ProjectService;
import org.jboss.labs.admin.Pages;
-import org.jboss.labs.injection.seam.Guice;
+import org.jboss.labs.seam.guice.Guice;
import org.jboss.seam.ScopeType;
import org.jboss.seam.core.Conversation;
import org.jboss.seam.annotations.In;
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/SaveProject.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/SaveProject.java 2008-06-16 15:32:46 UTC (rev 20544)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/SaveProject.java 2008-06-16 16:44:29 UTC (rev 20545)
@@ -26,7 +26,7 @@
import com.google.inject.Inject;
import org.jboss.labs.core.model.Project;
import org.jboss.labs.core.service.ProjectService;
-import org.jboss.labs.injection.seam.Guice;
+import org.jboss.labs.seam.guice.Guice;
import org.jboss.labs.exception.LabsRollbackException;
import org.jboss.seam.annotations.*;
import org.jboss.seam.faces.FacesMessages;
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ShowView.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ShowView.java 2008-06-16 15:32:46 UTC (rev 20544)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ShowView.java 2008-06-16 16:44:29 UTC (rev 20545)
@@ -26,7 +26,7 @@
import org.jboss.labs.admin.Pages;
import org.jboss.labs.core.service.LicenseService;
import org.jboss.labs.core.model.License;
-import org.jboss.labs.injection.seam.Guice;
+import org.jboss.labs.seam.guice.Guice;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Out;
import org.jboss.seam.ScopeType;
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ViewProject.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ViewProject.java 2008-06-16 15:32:46 UTC (rev 20544)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ViewProject.java 2008-06-16 16:44:29 UTC (rev 20545)
@@ -26,7 +26,7 @@
import com.google.inject.Inject;
import org.jboss.labs.core.model.Project;
import org.jboss.labs.core.service.ProjectService;
-import org.jboss.labs.injection.seam.Guice;
+import org.jboss.labs.seam.guice.Guice;
import org.jboss.labs.exception.admin.ProjectNotFoundException;
import org.jboss.labs.admin.Pages;
import org.jboss.seam.annotations.*;
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/license/UpdateProjectLicenses.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/license/UpdateProjectLicenses.java 2008-06-16 15:32:46 UTC (rev 20544)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/license/UpdateProjectLicenses.java 2008-06-16 16:44:29 UTC (rev 20545)
@@ -31,7 +31,7 @@
import org.jboss.labs.core.model.License;
import org.jboss.labs.core.model.Project;
import org.jboss.labs.core.service.ProjectService;
-import org.jboss.labs.injection.seam.Guice;
+import org.jboss.labs.seam.guice.Guice;
import org.jboss.labs.exception.LabsRollbackException;
import org.jboss.labs.admin.Pages;
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/AcceptJoin.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/AcceptJoin.java 2008-06-16 15:32:46 UTC (rev 20544)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/AcceptJoin.java 2008-06-16 16:44:29 UTC (rev 20545)
@@ -29,7 +29,7 @@
import org.jboss.labs.core.model.admin.JoinRequest;
import org.jboss.labs.core.service.ProjectService;
import org.jboss.labs.exception.LabsRollbackException;
-import org.jboss.labs.injection.seam.Guice;
+import org.jboss.labs.seam.guice.Guice;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Logger;
import org.jboss.seam.annotations.Name;
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/JoinProject.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/JoinProject.java 2008-06-16 15:32:46 UTC (rev 20544)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/JoinProject.java 2008-06-16 16:44:29 UTC (rev 20545)
@@ -30,7 +30,7 @@
import org.jboss.labs.core.model.admin.JoinRequest;
import org.jboss.labs.core.model.auth.User;
import org.jboss.labs.core.service.ProjectService;
-import org.jboss.labs.injection.seam.Guice;
+import org.jboss.labs.seam.guice.Guice;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/MembersManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/MembersManager.java 2008-06-16 15:32:46 UTC (rev 20544)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/MembersManager.java 2008-06-16 16:44:29 UTC (rev 20545)
@@ -27,7 +27,7 @@
import org.jboss.labs.core.model.Username;
import org.jboss.labs.core.service.ProjectService;
import org.jboss.labs.admin.Pages;
-import org.jboss.labs.injection.seam.Guice;
+import org.jboss.labs.seam.guice.Guice;
import org.jboss.labs.exception.auth.NoSuchUserException;
import org.jboss.labs.exception.LabsRollbackException;
import org.jboss.seam.annotations.*;
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/UserServiceWrapper.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/UserServiceWrapper.java 2008-06-16 15:32:46 UTC (rev 20544)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/UserServiceWrapper.java 2008-06-16 16:44:29 UTC (rev 20545)
@@ -27,7 +27,7 @@
import org.jboss.labs.core.model.Username;
import org.jboss.labs.core.service.ProjectService;
import org.jboss.labs.admin.Pages;
-import org.jboss.labs.injection.seam.Guice;
+import org.jboss.labs.seam.guice.Guice;
import org.jboss.labs.exception.auth.NoSuchUserException;
import org.jboss.labs.exception.LabsRollbackException;
import org.jboss.labs.auth.UserService;
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/auth/Authenticator.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/auth/Authenticator.java 2008-06-16 15:32:46 UTC (rev 20544)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/auth/Authenticator.java 2008-06-16 16:44:29 UTC (rev 20545)
@@ -30,7 +30,7 @@
import org.jboss.labs.core.model.auth.User;
import org.jboss.labs.core.service.ProjectService;
import org.jboss.labs.exception.auth.NoSuchUserException;
-import org.jboss.labs.injection.seam.Guice;
+import org.jboss.labs.seam.guice.Guice;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Logger;
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/auth/SecurityInitializer.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/auth/SecurityInitializer.java 2008-06-16 15:32:46 UTC (rev 20544)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/auth/SecurityInitializer.java 2008-06-16 16:44:29 UTC (rev 20545)
@@ -27,7 +27,7 @@
import org.jboss.seam.ScopeType;
import org.jboss.seam.log.Log;
import org.jboss.labs.auth.RoleBinderService;
-import org.jboss.labs.injection.seam.Guice;
+import org.jboss.labs.seam.guice.Guice;
import com.google.inject.Inject;
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/auth/SecurityManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/auth/SecurityManager.java 2008-06-16 15:32:46 UTC (rev 20544)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/auth/SecurityManager.java 2008-06-16 16:44:29 UTC (rev 20545)
@@ -25,7 +25,7 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.In;
-import org.jboss.labs.injection.seam.Guice;
+import org.jboss.labs.seam.guice.Guice;
import org.jboss.labs.auth.AuthenticationService;
import org.jboss.labs.auth.UserService;
import org.jboss.labs.exception.auth.NoSuchUserException;
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/validator/EmailValidator.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/validator/EmailValidator.java 2008-06-16 15:32:46 UTC (rev 20544)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/validator/EmailValidator.java 2008-06-16 16:44:29 UTC (rev 20545)
@@ -23,7 +23,7 @@
package org.jboss.labs.admin.validator;
-import org.jboss.labs.injection.seam.Guice;
+import org.jboss.labs.seam.guice.Guice;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.faces.Validator;
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/validator/UniqueProjectIdValidator.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/validator/UniqueProjectIdValidator.java 2008-06-16 15:32:46 UTC (rev 20544)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/validator/UniqueProjectIdValidator.java 2008-06-16 16:44:29 UTC (rev 20545)
@@ -23,7 +23,7 @@
package org.jboss.labs.admin.validator;
-import org.jboss.labs.injection.seam.Guice;
+import org.jboss.labs.seam.guice.Guice;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.faces.Validator;
More information about the jboss-svn-commits
mailing list