[seam-commits] Seam SVN: r14841 - in branches/enterprise/WFK-2_0: bom and 10 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Wed Jun 6 13:27:10 EDT 2012
Author: manaRH
Date: 2012-06-06 13:27:08 -0400 (Wed, 06 Jun 2012)
New Revision: 14841
Removed:
branches/enterprise/WFK-2_0/jboss-seam-flex/pom.xml
branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexAuthenticationBridge.java
branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexFilter.java
branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexRemote.java
branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexSeamFactory.java
branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/MessageBrokerManager.java
branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/Remote.java
branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/SeamAdapter.java
branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/SeamFlexConfigurationManager.java
branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/package-info.java
branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/resources/META-INF/flex/seam-default-services-config.xml
branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/resources/META-INF/seam-deployment.properties
branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/resources/seam.properties
Modified:
branches/enterprise/WFK-2_0/bom/pom.xml
branches/enterprise/WFK-2_0/build/common.build.xml
branches/enterprise/WFK-2_0/distribution/pom.xml
branches/enterprise/WFK-2_0/distribution/src/main/assembly/dist.xml
branches/enterprise/WFK-2_0/jboss-seam-gen/dist/icefaces/build-scripts/deployed-jars-ear-war.list
branches/enterprise/WFK-2_0/jboss-seam-gen/dist/icefaces/build-scripts/deployed-jars-war.list
branches/enterprise/WFK-2_0/pom.xml
branches/enterprise/WFK-2_0/seam-integration-tests/pom.xml
Log:
bz #828702 removed flex module
Modified: branches/enterprise/WFK-2_0/bom/pom.xml
===================================================================
--- branches/enterprise/WFK-2_0/bom/pom.xml 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/bom/pom.xml 2012-06-06 17:27:08 UTC (rev 14841)
@@ -167,12 +167,6 @@
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-flex</artifactId>
- <version>${version.seam}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-excel</artifactId>
<version>${version.seam}</version>
</dependency>
@@ -185,18 +179,6 @@
</dependency>
<dependency>
- <groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-jpdl</artifactId>
- <version>3.2.10.SP3_seam2</version>
- <exclusions>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>1.2.3</version>
Modified: branches/enterprise/WFK-2_0/build/common.build.xml
===================================================================
--- branches/enterprise/WFK-2_0/build/common.build.xml 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/build/common.build.xml 2012-06-06 17:27:08 UTC (rev 14841)
@@ -77,11 +77,9 @@
<target name="copyseamdependencies" if="mavenized.property" unless="copyseamdependenciesdone" depends="initcopy, initpoms">
<copyDependencies id="core" pom="${core.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="debug" pom="${debug.pom}" todir="${lib.dir}" scope="runtime" />
- <copyDependencies id="wicket" pom="${wicket.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="ioc" pom="${ioc.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="mail" pom="${mail.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="pdf" pom="${pdf.pom}" todir="${lib.dir}" scope="runtime" />
- <copyDependencies id="flex" pom="${flex.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="excel" pom="${excel.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="remoting" pom="${remoting.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="resteasy" pom="${resteasy.pom}" todir="${lib.dir}" scope="runtime" />
@@ -89,13 +87,10 @@
<copyDependencies id="gen" pom="${gen.pom}" todir="${lib.dir}/gen" scope="runtime" />
<copyDependencies id="core" pom="${core.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="debug" pom="${debug.pom}" todir="${lib.dir}" scope="compile" />
- <copyDependencies id="wicket" pom="${wicket.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="ioc" pom="${ioc.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="mail" pom="${mail.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="pdf" pom="${pdf.pom}" todir="${lib.dir}" scope="compile" />
- <copyDependencies id="flex" pom="${flex.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="excel" pom="${excel.pom}" todir="${lib.dir}" scope="compile" />
- <copyDependencies id="rss" pom="${rss.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="remoting" pom="${remoting.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="resteasy" pom="${resteasy.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="ui" pom="${ui.pom}" todir="${lib.dir}" scope="compile" />
@@ -111,7 +106,6 @@
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-ioc" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-mail" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-pdf" version="${complete.version}" />
- <dependency groupId="org.jboss.seam" artifactId="jboss-seam-flex" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-remoting" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-resteasy" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-ui" version="${complete.version}" />
Modified: branches/enterprise/WFK-2_0/distribution/pom.xml
===================================================================
--- branches/enterprise/WFK-2_0/distribution/pom.xml 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/distribution/pom.xml 2012-06-06 17:27:08 UTC (rev 14841)
@@ -80,10 +80,6 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-flex</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-ioc</artifactId>
</dependency>
<dependency>
@@ -127,12 +123,6 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-flex</artifactId>
- <classifier>sources</classifier>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-ioc</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
Modified: branches/enterprise/WFK-2_0/distribution/src/main/assembly/dist.xml
===================================================================
--- branches/enterprise/WFK-2_0/distribution/src/main/assembly/dist.xml 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/distribution/src/main/assembly/dist.xml 2012-06-06 17:27:08 UTC (rev 14841)
@@ -129,7 +129,6 @@
<include>org.jboss.seam:jboss-seam-mail:jar</include>
<include>org.jboss.seam:jboss-seam-resteasy:jar</include>
<include>org.jboss.seam:jboss-seam-remoting:jar</include>
- <include>org.jboss.seam:jboss-seam-flex:jar</include>
<include>org.jboss.seam:jboss-seam-ioc:jar</include>
</includes>
<excludes>
Deleted: branches/enterprise/WFK-2_0/jboss-seam-flex/pom.xml
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-flex/pom.xml 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/jboss-seam-flex/pom.xml 2012-06-06 17:27:08 UTC (rev 14841)
@@ -1,96 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>jboss-seam-parent</artifactId>
- <groupId>org.jboss.seam</groupId>
- <version>2.3.0.Beta2-redhat-1</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>jboss-seam-flex</artifactId>
- <name>Seam Flex</name>
-
- <dependencies>
- <dependency>
- <groupId>com.adobe.blazeds</groupId>
- <artifactId>blazeds-common</artifactId>
- </dependency>
- <dependency>
- <groupId>com.adobe.blazeds</groupId>
- <artifactId>blazeds-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.adobe.blazeds</groupId>
- <artifactId>blazeds-remoting</artifactId>
- </dependency>
- <dependency>
- <groupId>com.adobe.blazeds</groupId>
- <artifactId>blazeds-proxy</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- <type>ejb</type>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.servlet</groupId>
- <artifactId>jboss-servlet-api_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.el</groupId>
- <artifactId>jboss-el-api_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
-
- <profiles>
- <profile>
- <id>code-coverage</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>emma-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>distribution</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <excludeGroupIds>org.jboss.seam</excludeGroupIds>
- <excludeClassifiers>sources, project, distribution</excludeClassifiers>
- <outputDirectory>../jar-dependencies</outputDirectory>
- <stripVersion>true</stripVersion>
- <type>jar</type>
- <transitive>true</transitive>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
Deleted: branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexAuthenticationBridge.java
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexAuthenticationBridge.java 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexAuthenticationBridge.java 2012-06-06 17:27:08 UTC (rev 14841)
@@ -1,38 +0,0 @@
-package org.jboss.seam.flex;
-
-import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.log.LogProvider;
-import org.jboss.seam.log.Logging;
-import org.jboss.seam.security.Credentials;
-import org.jboss.seam.security.Identity;
-
-
- at Name("org.jboss.seam.flex.login")
- at Install(false)
- at FlexRemote(name="login")
-public class FlexAuthenticationBridge
-{
- private static final LogProvider log = Logging.getLogProvider(FlexAuthenticationBridge.class);
-
- @In Identity identity;
- @In Credentials credentials;
-
- public String login(String username, String password) {
- System.out.println("---");
- log.info("*LOGIN " + username + " " + password);
- credentials.setUsername(username);
- credentials.setPassword(password);
-
- String result = identity.login();
-
- log.info("*LOGIN RESULT " + result);
- return result;
- }
-
- public void logout() {
- log.info("*LOGOUT ");
- identity.logout();
- }
-}
Deleted: branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexFilter.java
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexFilter.java 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexFilter.java 2012-06-06 17:27:08 UTC (rev 14841)
@@ -1,122 +0,0 @@
-package org.jboss.seam.flex;
-
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import java.io.*;
-import java.util.*;
-
-import org.jboss.seam.*;
-
-import org.jboss.seam.annotations.*;
-import org.jboss.seam.annotations.intercept.*;
-import org.jboss.seam.deployment.AnnotationDeploymentHandler;
-import org.jboss.seam.deployment.DeploymentStrategy;
-import org.jboss.seam.log.LogProvider;
-import org.jboss.seam.log.Logging;
-import org.jboss.seam.web.AbstractFilter;
-
- at Scope(ScopeType.APPLICATION)
- at Name("org.jboss.seam.flex.flexFilter")
- at Startup
- at Install(precedence=Install.BUILT_IN, value=false)
- at BypassInterceptors
- at org.jboss.seam.annotations.web.Filter //within={"org.jboss.seam.????"}
-public class FlexFilter
- extends AbstractFilter
-{
- private static final LogProvider log = Logging.getLogProvider(FlexFilter.class);
-
- MessageBrokerManager messageBrokerManager;
- List<Class<?>> scanned = new ArrayList<Class<?>>();
-
- private AnnotationDeploymentHandler annotationDeploymentHandler() {
- DeploymentStrategy deployment = (DeploymentStrategy) Component.getInstance("deploymentStrategy");
-
- if (deployment != null) {
- return (AnnotationDeploymentHandler)
- deployment.getDeploymentHandlers().get(AnnotationDeploymentHandler.NAME);
- }
-
- return null;
- }
-
- private Collection<Class<?>> scannedClasses() {
- Collection<Class<?>> result = null;
-
- AnnotationDeploymentHandler handler = annotationDeploymentHandler();
- if (handler !=null) {
- result = handler.getClassMap().get(FlexRemote.class.getName());
- }
-
- return result != null ? result : new ArrayList<Class<?>>(0);
- }
-
- @Create
- public void seamInit() {
- // deployment handler only knows about scanned classes during startup
- // so we need to get them now and save them
- scanned.addAll(scannedClasses());
- }
-
- @Override
- public void init(FilterConfig filterConfig)
- throws ServletException
- {
- super.init(filterConfig);
-
- messageBrokerManager = new MessageBrokerManager();
- messageBrokerManager.init(new FlexServletConfig(filterConfig.getServletContext()));
- messageBrokerManager.addDestinations(scanned);
- }
-
-
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
- throws IOException, ServletException
- {
- if (isMappedToCurrentRequestPath(request)) {
- messageBrokerManager.service((HttpServletRequest)request, (HttpServletResponse)response);
- } else {
- chain.doFilter(request, response);
- }
- }
-
-
- private static class FlexServletConfig
- implements ServletConfig
- {
- Map<String,String> params;
- ServletContext context;
-
- public FlexServletConfig(ServletContext context) {
- this(context, null);
- }
-
- public FlexServletConfig(ServletContext context, Map<String,String> params) {
- this.context = context;
- this.params = (params!=null) ? params : new HashMap<String,String>();
- }
-
- public ServletContext getServletContext() {
- return context;
- }
-
- public String getServletName() {
- return "FlexServlet";
- }
-
- public String getInitParameter(String param) {
- String result = params.get(param);
-
- log.info("init param " + param + " is " + result);
- return result;
- }
-
- @SuppressWarnings("unchecked")
- public Enumeration getInitParameterNames() {
- return Collections.enumeration(params.keySet());
- }
-
- }
-}
\ No newline at end of file
Deleted: branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexRemote.java
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexRemote.java 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexRemote.java 2012-06-06 17:27:08 UTC (rev 14841)
@@ -1,16 +0,0 @@
-package org.jboss.seam.flex;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-
- at Target(ElementType.TYPE)
- at Documented
- at Retention(RetentionPolicy.RUNTIME)
-public @interface FlexRemote
-{
- abstract String name();
-}
Deleted: branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexSeamFactory.java
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexSeamFactory.java 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexSeamFactory.java 2012-06-06 17:27:08 UTC (rev 14841)
@@ -1,45 +0,0 @@
-package org.jboss.seam.flex;
-
-import org.jboss.seam.Component;
-import org.jboss.seam.log.LogProvider;
-import org.jboss.seam.log.Logging;
-
-import flex.messaging.FlexFactory;
-import flex.messaging.FactoryInstance;
-import flex.messaging.config.ConfigMap;
-
-
-public class FlexSeamFactory
- implements FlexFactory
-{
- private static final LogProvider log = Logging.getLogProvider(FlexSeamFactory.class);
-
- String destinationName;
- String componentName;
-
- public FlexSeamFactory(String destinationName, String componentName) {
- this.componentName = componentName;
- this.destinationName = destinationName;
- }
-
- public void initialize(String id, ConfigMap configMap) {
- log.info("!FSF init " + id + " props=" + configMap);
- }
-
- public FactoryInstance createFactoryInstance(String id, ConfigMap properties) {
- log.info("!FSF create factory " + id + " props=" + properties);
- return new FactoryInstance(this, id, properties);
- }
-
- public Object lookup(FactoryInstance factory) {
- log.info("!FSF lookup " + factory);
-
- try {
- Object instance = Component.getInstance(componentName, true);
- return instance;
- } catch (Exception e) {
- log.error(e);
- return null;
- }
- }
-}
Deleted: branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/MessageBrokerManager.java
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/MessageBrokerManager.java 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/MessageBrokerManager.java 2012-06-06 17:27:08 UTC (rev 14841)
@@ -1,266 +0,0 @@
-package org.jboss.seam.flex;
-
-import java.io.*;
-import java.lang.reflect.Method;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.Collection;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-
-import flex.messaging.*;
-import flex.messaging.config.*;
-import flex.messaging.endpoints.Endpoint;
-import flex.messaging.log.ServletLogTarget;
-import flex.messaging.services.RemotingService;
-import flex.messaging.services.remoting.*;
-
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.log.LogProvider;
-import org.jboss.seam.log.Logging;
-import org.jboss.seam.util.Reflections;
-import org.jboss.seam.util.Resources;
-
-
-public class MessageBrokerManager
-{
- private static final String SEAM_ENDPOINT = "seam-amf";
-
- private static final LogProvider log = Logging.getLogProvider(MessageBrokerManager.class);
-
- private static String WAR_CONFIG_PREFIX = "/WEB-INF/flex/";
- private static String EAR_CONFIG_PREFIX = "/META-INF/flex/seam-default-";
-
- private flex.messaging.MessageBroker broker;
-
- private ServletConfig servletConfig;
-
-
- public void init(ServletConfig servletConfig)
- throws ServletException
- {
- this.servletConfig = servletConfig;
-
- // allocate thread local variables
- createThreadLocals();
-
- try
- {
- FlexContext.setThreadLocalObjects(null, null, null, null, null, servletConfig);
- ServletLogTarget.setServletContext(servletConfig.getServletContext());
-
- FlexConfigurationManager configManager = new SeamFlexConfigurationManager();
- MessagingConfiguration config = configManager.getMessagingConfiguration(servletConfig);
-
- config.createLogAndTargets();
- broker = config.createBroker(servletConfig.getInitParameter("messageBrokerId"),
- Thread.currentThread().getContextClassLoader());
-
- // Set the servlet config as thread local
- FlexContext.setThreadLocalObjects(null, null, broker, null, null, servletConfig);
-
- setInitServletContext(broker, servletConfig.getServletContext());
-
- // Create endpoints, services, security, and logger on the broker based on configuration
- config.configureBroker(broker);
-
-
- if (broker.getChannelIds()== null || !broker.getChannelIds().contains(SEAM_ENDPOINT)) {
- log.info("seam-amf endpoint not found. creating...");
-
- broker.createEndpoint(SEAM_ENDPOINT,
- "http://{server.name}:{server.port}/{context.root}/messagebroker/seam-amf",
- "flex.messaging.endpoints.AMFEndpoint");
- }
-
-
- //initialize the httpSessionToFlexSessionMap
- synchronized(HttpFlexSession.mapLock)
- {
- if (servletConfig.getServletContext().getAttribute(HttpFlexSession.SESSION_MAP) == null) {
- servletConfig.getServletContext().setAttribute(HttpFlexSession.SESSION_MAP, new ConcurrentHashMap());
- }
- }
-
- broker.start();
-
- configManager.reportTokens();
- config.reportUnusedProperties();
-
-
-
- // clear the broker and servlet config as this thread is done
- FlexContext.clearThreadLocalObjects();
-
- } catch (Throwable t){
- log.error("MessageBrokerServlet failed to initialize due to runtime exception");
- destroy();
- throw new ServletException(t);
- }
- }
-
-
- private void setInitServletContext(flex.messaging.MessageBroker broker, ServletContext ctx)
- throws Exception
- {
- Method setMethod = flex.messaging.MessageBroker.class.
- getDeclaredMethod("setInitServletContext", ServletContext.class);
- setMethod.setAccessible(true);
- Reflections.invoke(setMethod, broker, ctx);
- }
-
-
-
- public void destroy()
- {
- if (broker != null) {
- broker.stop();
- // release static thread locals
- destroyThreadLocals();
- }
- }
-
- public void service(HttpServletRequest req, HttpServletResponse res)
- {
- log.info("=========== START FLEX REQUEST");
- try {
- broker.initThreadLocals();
-
- FlexContext.setThreadLocalObjects(null, null, broker, req, res, servletConfig);
-
- // necessary to create for later
- HttpFlexSession fs = HttpFlexSession.getFlexSession(req);
- log.info("flex session is " + fs);
-
- Endpoint endpoint = findEndpoint(req, res);
- log.info("Endpoint: " + endpoint.describeEndpoint());
-
- endpoint.service(req, res);
- } catch (UnsupportedOperationException ue) {
- ue.printStackTrace();
- sendError(res);
- } catch (RuntimeException e) {
- e.printStackTrace();
- } finally {
- FlexContext.clearThreadLocalObjects();
- }
-
- log.info("=========== END FLEX REQUEST");
- }
-
-
- private void sendError(HttpServletResponse res)
- {
- if (!res.isCommitted()) {
- try {
- res.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
- } catch (IOException ignored) {
-
- }
- }
- }
-
-
- private Endpoint findEndpoint(HttpServletRequest req, HttpServletResponse res)
- {
- String contextPath = req.getContextPath();
- String pathInfo = req.getPathInfo();
- String endpointPath = req.getServletPath();
- if (pathInfo != null) {
- endpointPath = endpointPath + pathInfo;
- }
-
- log.info("flex request for cp=" + contextPath + " ep=" + endpointPath);
- try {
- return broker.getEndpoint(endpointPath, contextPath);
- } catch (MessageException me) {
- if (!res.isCommitted()) {
- try {
- res.sendError(HttpServletResponse.SC_NOT_FOUND);
- } catch (IOException ignore) {
- // ignore
- }
- }
- return null;
- }
- }
-
-
- // Call ONLY on servlet startup
- public void createThreadLocals()
- {
- // allocate static thread local objects
- flex.messaging.MessageBroker.createThreadLocalObjects();
- FlexContext.createThreadLocalObjects();
- flex.messaging.io.SerializationContext.createThreadLocalObjects();
- flex.messaging.io.TypeMarshallingContext.createThreadLocalObjects();
- }
-
- protected void destroyThreadLocals()
- {
- // Destroy static thread local objects
- flex.messaging.MessageBroker.releaseThreadLocalObjects();
- FlexContext.releaseThreadLocalObjects();
- flex.messaging.io.SerializationContext.releaseThreadLocalObjects();
- flex.messaging.io.TypeMarshallingContext.releaseThreadLocalObjects();
- }
-
-
- private RemotingService createRemotingService() {
- RemotingService remotingService = null;
-
- remotingService = new RemotingService();
- remotingService.setId("remoting-service");
-
- broker.addService(remotingService);
- log.info("Flex remotingservice not found- creating " + remotingService);
- return remotingService;
- }
-
-
- private RemotingService findRemotingService() {
- return (RemotingService) broker.getServiceByType(RemotingService.class.getName());
- }
-
- private void registerSeamAdapter(RemotingService remotingService) {
- if (remotingService.getRegisteredAdapters().get(SeamAdapter.SEAM_ADAPTER_ID) == null) {
- remotingService.registerAdapter(SeamAdapter.SEAM_ADAPTER_ID,SeamAdapter.class.getName());
- }
- }
-
- private Destination createDestination(String destinationName, String componentName) {
- RemotingService remotingService = findRemotingService();
- if (remotingService==null) {
- remotingService = createRemotingService();
- }
-
- RemotingDestination destination =
- (RemotingDestination) remotingService.createDestination(destinationName);
-
- destination.setFactory(new FlexSeamFactory(destinationName, componentName));
-
- // configure adapter
- registerSeamAdapter(remotingService);
- destination.createAdapter(SeamAdapter.SEAM_ADAPTER_ID);
-
- destination.addChannel(SEAM_ENDPOINT);
-
- return destination;
- }
-
- public void addDestinations(Collection<Class<?>> destinations) {
- for (Class<?> annotatedClass: destinations) {
- log.info("Adding scanned flex desitionation for class " + annotatedClass);
- FlexRemote fr = annotatedClass.getAnnotation(FlexRemote.class);
-
- Name name = annotatedClass.getAnnotation(Name.class);
-
- String destinationName = fr.name();
- String componentName = name.value();
- Destination destination = createDestination(destinationName, componentName);
-
- destination.start();
- }
- }
-
-}
Deleted: branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/Remote.java
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/Remote.java 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/Remote.java 2012-06-06 17:27:08 UTC (rev 14841)
@@ -1,41 +0,0 @@
-package org.jboss.seam.flex;
-
-import org.jboss.seam.ScopeType;
-import org.jboss.seam.annotations.Create;
-import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.Startup;
-
- at Name("org.jboss.seam.flex.remote")
- at Startup
- at Install(false)
- at Scope(ScopeType.APPLICATION)
-public class Remote
-{
- String destinationName;
- String componentName;
-
- public void setDestinationName(String destionationName) {
- this.destinationName = destionationName;
- }
-
- public String getDestinationName() {
- return destinationName;
- }
-
- public void setComponentName(String componentName) {
- this.componentName = componentName;
- }
-
- public String getComponentName() {
- return componentName;
- }
-
-
- @Create
- public void init() {
- //System.out.println("** remoting destination " + destinationName + " for " + componentName);
- }
-
-}
Deleted: branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/SeamAdapter.java
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/SeamAdapter.java 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/SeamAdapter.java 2012-06-06 17:27:08 UTC (rev 14841)
@@ -1,104 +0,0 @@
-package org.jboss.seam.flex;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.jboss.seam.contexts.ServletLifecycle;
-import org.jboss.seam.core.ConversationPropagation;
-import org.jboss.seam.core.Manager;
-import org.jboss.seam.log.LogProvider;
-import org.jboss.seam.log.Logging;
-import org.jboss.seam.servlet.ServletRequestSessionMap;
-import org.jboss.seam.web.ServletContexts;
-
-import flex.messaging.FlexContext;
-import flex.messaging.services.remoting.adapters.JavaAdapter;
-import flex.messaging.messages.AcknowledgeMessage;
-import flex.messaging.messages.Message;
-
-/**
- * The Seam adaptor should translate seam exceptions and do any other additional
- * management needed
- */
-public class SeamAdapter
- extends JavaAdapter
-{
- public static final String SEAM_ADAPTER_ID = "seam-adapter";
- private static final String CONVERSATION_ID = "conversationId";
-
- private static final LogProvider log = Logging.getLogProvider(SeamAdapter.class);
-
- @Override
- public Object invoke(Message message) {
- log.info("SeamAdapter: " + message);
-
- try {
- startSeamContexts(message, FlexContext.getHttpRequest());
-
- Object result = wrapResult(super.invoke(message));
-
- endSeamContexts(FlexContext.getHttpRequest());
-
- return result;
- } catch (RuntimeException e) {
- // XXX end request properly....
- e.printStackTrace();
- throw e;
- }
- }
-
-
- protected Object wrapResult(Object result)
- {
- AcknowledgeMessage response = new AcknowledgeMessage();
- response.setHeader(CONVERSATION_ID, Manager.instance().getCurrentConversationId());
- response.setBody(result);
-
- return response;
- }
-
-
- protected void startSeamContexts(Message message, HttpServletRequest request)
- {
- ServletLifecycle.beginRequest(request);
- ServletContexts.instance().setRequest(request);
-
- Map conversationParameters = conversationMap(message);
- ConversationPropagation.instance().restoreConversationId(conversationParameters);
- Manager.instance().restoreConversation();
- ServletLifecycle.resumeConversation(request);
- Manager.instance().handleConversationPropagation(conversationParameters);
-
- // Force creation of the session
- if (request.getSession(false) == null) {
- request.getSession(true);
- }
-
- }
-
- protected void endSeamContexts(HttpServletRequest request)
- {
- Manager.instance().endRequest( new ServletRequestSessionMap(request) );
- ServletLifecycle.endRequest(request);
- }
-
- protected Map conversationMap(Message message) {
- Map result = new HashMap();
-
- result.put(Manager.instance().getConversationIdParameter(), conversationId(message));
- return result;
- }
-
- protected String conversationId(Message message) {
- if (message == null) {
- return null;
- }
-
- Object header = message.getHeader(CONVERSATION_ID);
-
- return header == null ? null : header.toString();
- }
-}
Deleted: branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/SeamFlexConfigurationManager.java
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/SeamFlexConfigurationManager.java 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/SeamFlexConfigurationManager.java 2012-06-06 17:27:08 UTC (rev 14841)
@@ -1,36 +0,0 @@
-package org.jboss.seam.flex;
-
-import java.io.InputStream;
-
-import javax.servlet.ServletConfig;
-
-import org.jboss.seam.util.Resources;
-
-import flex.messaging.config.FlexConfigurationManager;
-import flex.messaging.config.ServletResourceResolver;
-
-public class SeamFlexConfigurationManager
-extends FlexConfigurationManager
-{
-
- private static final String USER_CONFIG_FILE = "/WEB-INF/flex/services-config.xml";
- private static final String SEAM_DEFAULT_CONFIG_FILE = "/META-INF/flex/seam-default-services-config.xml";
-
- @Override
- protected void setupConfigurationPathAndResolver(final ServletConfig config)
- {
- configurationPath = USER_CONFIG_FILE;
-
- if (Resources.getResource(USER_CONFIG_FILE, config.getServletContext()) == null) {
- configurationPath = SEAM_DEFAULT_CONFIG_FILE;
- }
-
- configurationResolver = new ServletResourceResolver(config.getServletContext()) {
-
- @Override
- public InputStream getConfigurationFile(String path) {
- return Resources.getResourceAsStream(path, config.getServletContext());
- }
- };
- }
-}
Deleted: branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/package-info.java
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/package-info.java 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/package-info.java 2012-06-06 17:27:08 UTC (rev 14841)
@@ -1,7 +0,0 @@
- at Namespace(value="http://jboss.org/schema/seam/flex", prefix="org.jboss.seam.flex")
- at AutoCreate
-package org.jboss.seam.flex;
-
-import org.jboss.seam.annotations.AutoCreate;
-import org.jboss.seam.annotations.Namespace;
-
Deleted: branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/resources/META-INF/flex/seam-default-services-config.xml
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/resources/META-INF/flex/seam-default-services-config.xml 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/resources/META-INF/flex/seam-default-services-config.xml 2012-06-06 17:27:08 UTC (rev 14841)
@@ -1 +0,0 @@
-<services-config />
Deleted: branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/resources/META-INF/seam-deployment.properties
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/resources/META-INF/seam-deployment.properties 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/resources/META-INF/seam-deployment.properties 2012-06-06 17:27:08 UTC (rev 14841)
@@ -1 +0,0 @@
-org.jboss.seam.deployment.annotationTypes=org.jboss.seam.flex.FlexRemote
\ No newline at end of file
Deleted: branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/resources/seam.properties
===================================================================
Modified: branches/enterprise/WFK-2_0/jboss-seam-gen/dist/icefaces/build-scripts/deployed-jars-ear-war.list
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-gen/dist/icefaces/build-scripts/deployed-jars-ear-war.list 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/jboss-seam-gen/dist/icefaces/build-scripts/deployed-jars-ear-war.list 2012-06-06 17:27:08 UTC (rev 14841)
@@ -5,9 +5,5 @@
jboss-seam-mail.jar
jboss-seam-pdf.jar
jboss-seam-remoting.jar
-jboss-seam-rss.jar
-jboss-seam-flex.jar
jboss-seam-jul.jar
jboss-seam-ui.jar
-jboss-seam-wicket-ant.jar
-jboss-seam-wicket.jar
Modified: branches/enterprise/WFK-2_0/jboss-seam-gen/dist/icefaces/build-scripts/deployed-jars-war.list
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-gen/dist/icefaces/build-scripts/deployed-jars-war.list 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/jboss-seam-gen/dist/icefaces/build-scripts/deployed-jars-war.list 2012-06-06 17:27:08 UTC (rev 14841)
@@ -9,9 +9,6 @@
drools-core.jar
drools-decisiontables.jar
drools-templates.jar
-icefaces.jar
-icefaces-comps.jar
-icefaces-facelets.jar
janino.jar
jboss-el.jar
jboss-seam.jar
@@ -21,11 +18,6 @@
jboss-seam-mail.jar
jboss-seam-pdf.jar
jboss-seam-remoting.jar
-jboss-seam-rss.jar
-jboss-seam-flex.jar
jboss-seam-jul.jar
jboss-seam-ui.jar
-jboss-seam-wicket-ant.jar
-jboss-seam-wicket.jar
-jbpm-jpdl.jar
mvel2.jar
Modified: branches/enterprise/WFK-2_0/pom.xml
===================================================================
--- branches/enterprise/WFK-2_0/pom.xml 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/pom.xml 2012-06-06 17:27:08 UTC (rev 14841)
@@ -359,7 +359,6 @@
<module>jboss-seam-debug</module>
<module>jboss-seam-gen</module>
<module>jboss-seam-excel</module>
- <module>jboss-seam-flex</module>
<module>jboss-seam-mail</module>
<module>jboss-seam-pdf</module>
<module>jboss-seam-remoting</module>
Modified: branches/enterprise/WFK-2_0/seam-integration-tests/pom.xml
===================================================================
--- branches/enterprise/WFK-2_0/seam-integration-tests/pom.xml 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/seam-integration-tests/pom.xml 2012-06-06 17:27:08 UTC (rev 14841)
@@ -174,7 +174,6 @@
<directory>${basedir}/../jboss-seam/src/main/java</directory>
<directory>${basedir}/../jboss-seam-debug/src/main/java</directory>
<directory>${basedir}/../jboss-seam-excel/src/main/java</directory>
- <directory>${basedir}/../jboss-seam-flex/src/main/java</directory>
<directory>${basedir}/../jboss-seam-gen/src/main/java</directory>
<directory>${basedir}/../jboss-seam-ioc/src/main/java</directory>
<directory>${basedir}/../jboss-seam-jul/src/main/java</directory>
More information about the seam-commits
mailing list