- Major code scrub
diff --git a/common/pom.xml b/common/pom.xml
index 8ee3926..f7cc8f5 100755
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -16,44 +16,29 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.flex.blazeds</groupId>
- <artifactId>blazeds</artifactId>
- <version>4.7.3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
+ <parent>
+ <groupId>org.apache.flex.blazeds</groupId>
+ <artifactId>blazeds</artifactId>
+ <version>4.7.3-SNAPSHOT</version>
+ </parent>
- <artifactId>flex-messaging-common</artifactId>
+ <artifactId>flex-messaging-common</artifactId>
- <dependencies>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.6.0</version>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>flex-messaging-common</finalName>
- <sourceDirectory>src</sourceDirectory>
- <resources>
- <resource>
- <directory>src</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- </resources>
- </build>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
diff --git a/common/src/flex/graphics/ImageSnapshot.java b/common/src/main/java/flex/graphics/ImageSnapshot.java
similarity index 100%
rename from common/src/flex/graphics/ImageSnapshot.java
rename to common/src/main/java/flex/graphics/ImageSnapshot.java
diff --git a/common/src/flex/graphics/package-info.java b/common/src/main/java/flex/graphics/package-info.java
similarity index 100%
rename from common/src/flex/graphics/package-info.java
rename to common/src/main/java/flex/graphics/package-info.java
diff --git a/common/src/flex/messaging/LocalizedException.java b/common/src/main/java/flex/messaging/LocalizedException.java
similarity index 100%
rename from common/src/flex/messaging/LocalizedException.java
rename to common/src/main/java/flex/messaging/LocalizedException.java
diff --git a/common/src/flex/messaging/config/AbstractConfigurationParser.java b/common/src/main/java/flex/messaging/config/AbstractConfigurationParser.java
similarity index 100%
rename from common/src/flex/messaging/config/AbstractConfigurationParser.java
rename to common/src/main/java/flex/messaging/config/AbstractConfigurationParser.java
diff --git a/common/src/flex/messaging/config/AdapterSettings.java b/common/src/main/java/flex/messaging/config/AdapterSettings.java
similarity index 100%
rename from common/src/flex/messaging/config/AdapterSettings.java
rename to common/src/main/java/flex/messaging/config/AdapterSettings.java
diff --git a/common/src/flex/messaging/config/ApacheXPathClientConfigurationParser.java b/common/src/main/java/flex/messaging/config/ApacheXPathClientConfigurationParser.java
similarity index 100%
rename from common/src/flex/messaging/config/ApacheXPathClientConfigurationParser.java
rename to common/src/main/java/flex/messaging/config/ApacheXPathClientConfigurationParser.java
diff --git a/common/src/flex/messaging/config/ChannelSettings.java b/common/src/main/java/flex/messaging/config/ChannelSettings.java
similarity index 100%
rename from common/src/flex/messaging/config/ChannelSettings.java
rename to common/src/main/java/flex/messaging/config/ChannelSettings.java
diff --git a/common/src/flex/messaging/config/ClientConfiguration.java b/common/src/main/java/flex/messaging/config/ClientConfiguration.java
similarity index 100%
rename from common/src/flex/messaging/config/ClientConfiguration.java
rename to common/src/main/java/flex/messaging/config/ClientConfiguration.java
diff --git a/common/src/flex/messaging/config/ClientConfigurationParser.java b/common/src/main/java/flex/messaging/config/ClientConfigurationParser.java
similarity index 100%
rename from common/src/flex/messaging/config/ClientConfigurationParser.java
rename to common/src/main/java/flex/messaging/config/ClientConfigurationParser.java
diff --git a/common/src/flex/messaging/config/ClusterSettings.java b/common/src/main/java/flex/messaging/config/ClusterSettings.java
similarity index 100%
rename from common/src/flex/messaging/config/ClusterSettings.java
rename to common/src/main/java/flex/messaging/config/ClusterSettings.java
diff --git a/common/src/flex/messaging/config/ConfigMap.java b/common/src/main/java/flex/messaging/config/ConfigMap.java
similarity index 100%
rename from common/src/flex/messaging/config/ConfigMap.java
rename to common/src/main/java/flex/messaging/config/ConfigMap.java
diff --git a/common/src/flex/messaging/config/ConfigurationConstants.java b/common/src/main/java/flex/messaging/config/ConfigurationConstants.java
similarity index 100%
rename from common/src/flex/messaging/config/ConfigurationConstants.java
rename to common/src/main/java/flex/messaging/config/ConfigurationConstants.java
diff --git a/common/src/flex/messaging/config/ConfigurationException.java b/common/src/main/java/flex/messaging/config/ConfigurationException.java
similarity index 100%
rename from common/src/flex/messaging/config/ConfigurationException.java
rename to common/src/main/java/flex/messaging/config/ConfigurationException.java
diff --git a/common/src/flex/messaging/config/ConfigurationFileResolver.java b/common/src/main/java/flex/messaging/config/ConfigurationFileResolver.java
similarity index 100%
rename from common/src/flex/messaging/config/ConfigurationFileResolver.java
rename to common/src/main/java/flex/messaging/config/ConfigurationFileResolver.java
diff --git a/common/src/flex/messaging/config/ConfigurationParser.java b/common/src/main/java/flex/messaging/config/ConfigurationParser.java
similarity index 100%
rename from common/src/flex/messaging/config/ConfigurationParser.java
rename to common/src/main/java/flex/messaging/config/ConfigurationParser.java
diff --git a/common/src/flex/messaging/config/DestinationSettings.java b/common/src/main/java/flex/messaging/config/DestinationSettings.java
similarity index 100%
rename from common/src/flex/messaging/config/DestinationSettings.java
rename to common/src/main/java/flex/messaging/config/DestinationSettings.java
diff --git a/common/src/flex/messaging/config/FlexClientSettings.java b/common/src/main/java/flex/messaging/config/FlexClientSettings.java
similarity index 100%
rename from common/src/flex/messaging/config/FlexClientSettings.java
rename to common/src/main/java/flex/messaging/config/FlexClientSettings.java
diff --git a/common/src/flex/messaging/config/LocalFileResolver.java b/common/src/main/java/flex/messaging/config/LocalFileResolver.java
similarity index 100%
rename from common/src/flex/messaging/config/LocalFileResolver.java
rename to common/src/main/java/flex/messaging/config/LocalFileResolver.java
diff --git a/common/src/flex/messaging/config/LoggingSettings.java b/common/src/main/java/flex/messaging/config/LoggingSettings.java
similarity index 100%
rename from common/src/flex/messaging/config/LoggingSettings.java
rename to common/src/main/java/flex/messaging/config/LoggingSettings.java
diff --git a/common/src/flex/messaging/config/LoginCommandSettings.java b/common/src/main/java/flex/messaging/config/LoginCommandSettings.java
similarity index 100%
rename from common/src/flex/messaging/config/LoginCommandSettings.java
rename to common/src/main/java/flex/messaging/config/LoginCommandSettings.java
diff --git a/common/src/flex/messaging/config/PropertiesSettings.java b/common/src/main/java/flex/messaging/config/PropertiesSettings.java
similarity index 100%
rename from common/src/flex/messaging/config/PropertiesSettings.java
rename to common/src/main/java/flex/messaging/config/PropertiesSettings.java
diff --git a/common/src/flex/messaging/config/SecurityConstraint.java b/common/src/main/java/flex/messaging/config/SecurityConstraint.java
similarity index 100%
rename from common/src/flex/messaging/config/SecurityConstraint.java
rename to common/src/main/java/flex/messaging/config/SecurityConstraint.java
diff --git a/common/src/flex/messaging/config/ServiceSettings.java b/common/src/main/java/flex/messaging/config/ServiceSettings.java
similarity index 100%
rename from common/src/flex/messaging/config/ServiceSettings.java
rename to common/src/main/java/flex/messaging/config/ServiceSettings.java
diff --git a/common/src/flex/messaging/config/ServicesConfiguration.java b/common/src/main/java/flex/messaging/config/ServicesConfiguration.java
similarity index 100%
rename from common/src/flex/messaging/config/ServicesConfiguration.java
rename to common/src/main/java/flex/messaging/config/ServicesConfiguration.java
diff --git a/common/src/flex/messaging/config/ServicesDependencies.java b/common/src/main/java/flex/messaging/config/ServicesDependencies.java
similarity index 100%
rename from common/src/flex/messaging/config/ServicesDependencies.java
rename to common/src/main/java/flex/messaging/config/ServicesDependencies.java
diff --git a/common/src/flex/messaging/config/TargetSettings.java b/common/src/main/java/flex/messaging/config/TargetSettings.java
similarity index 100%
rename from common/src/flex/messaging/config/TargetSettings.java
rename to common/src/main/java/flex/messaging/config/TargetSettings.java
diff --git a/common/src/flex/messaging/config/TokenReplacer.java b/common/src/main/java/flex/messaging/config/TokenReplacer.java
similarity index 100%
rename from common/src/flex/messaging/config/TokenReplacer.java
rename to common/src/main/java/flex/messaging/config/TokenReplacer.java
diff --git a/common/src/flex/messaging/config/XPathClientConfigurationParser.java b/common/src/main/java/flex/messaging/config/XPathClientConfigurationParser.java
similarity index 100%
rename from common/src/flex/messaging/config/XPathClientConfigurationParser.java
rename to common/src/main/java/flex/messaging/config/XPathClientConfigurationParser.java
diff --git a/common/src/flex/messaging/log/AbstractTarget.java b/common/src/main/java/flex/messaging/log/AbstractTarget.java
similarity index 100%
rename from common/src/flex/messaging/log/AbstractTarget.java
rename to common/src/main/java/flex/messaging/log/AbstractTarget.java
diff --git a/common/src/flex/messaging/log/ConsoleTarget.java b/common/src/main/java/flex/messaging/log/ConsoleTarget.java
similarity index 100%
rename from common/src/flex/messaging/log/ConsoleTarget.java
rename to common/src/main/java/flex/messaging/log/ConsoleTarget.java
diff --git a/common/src/flex/messaging/log/LineFormattedTarget.java b/common/src/main/java/flex/messaging/log/LineFormattedTarget.java
similarity index 100%
rename from common/src/flex/messaging/log/LineFormattedTarget.java
rename to common/src/main/java/flex/messaging/log/LineFormattedTarget.java
diff --git a/common/src/flex/messaging/log/Log.java b/common/src/main/java/flex/messaging/log/Log.java
similarity index 100%
rename from common/src/flex/messaging/log/Log.java
rename to common/src/main/java/flex/messaging/log/Log.java
diff --git a/common/src/flex/messaging/log/LogCategories.java b/common/src/main/java/flex/messaging/log/LogCategories.java
similarity index 100%
rename from common/src/flex/messaging/log/LogCategories.java
rename to common/src/main/java/flex/messaging/log/LogCategories.java
diff --git a/common/src/flex/messaging/log/LogEvent.java b/common/src/main/java/flex/messaging/log/LogEvent.java
similarity index 100%
rename from common/src/flex/messaging/log/LogEvent.java
rename to common/src/main/java/flex/messaging/log/LogEvent.java
diff --git a/common/src/flex/messaging/log/Logger.java b/common/src/main/java/flex/messaging/log/Logger.java
similarity index 100%
rename from common/src/flex/messaging/log/Logger.java
rename to common/src/main/java/flex/messaging/log/Logger.java
diff --git a/common/src/flex/messaging/log/Target.java b/common/src/main/java/flex/messaging/log/Target.java
similarity index 100%
rename from common/src/flex/messaging/log/Target.java
rename to common/src/main/java/flex/messaging/log/Target.java
diff --git a/common/src/flex/messaging/util/BasicPrettyPrinter.java b/common/src/main/java/flex/messaging/util/BasicPrettyPrinter.java
similarity index 100%
rename from common/src/flex/messaging/util/BasicPrettyPrinter.java
rename to common/src/main/java/flex/messaging/util/BasicPrettyPrinter.java
diff --git a/common/src/flex/messaging/util/ExceptionUtil.java b/common/src/main/java/flex/messaging/util/ExceptionUtil.java
similarity index 100%
rename from common/src/flex/messaging/util/ExceptionUtil.java
rename to common/src/main/java/flex/messaging/util/ExceptionUtil.java
diff --git a/common/src/flex/messaging/util/FileUtils.java b/common/src/main/java/flex/messaging/util/FileUtils.java
similarity index 100%
rename from common/src/flex/messaging/util/FileUtils.java
rename to common/src/main/java/flex/messaging/util/FileUtils.java
diff --git a/common/src/flex/messaging/util/LocaleUtils.java b/common/src/main/java/flex/messaging/util/LocaleUtils.java
similarity index 100%
rename from common/src/flex/messaging/util/LocaleUtils.java
rename to common/src/main/java/flex/messaging/util/LocaleUtils.java
diff --git a/common/src/flex/messaging/util/ObjectTrace.java b/common/src/main/java/flex/messaging/util/ObjectTrace.java
similarity index 100%
rename from common/src/flex/messaging/util/ObjectTrace.java
rename to common/src/main/java/flex/messaging/util/ObjectTrace.java
diff --git a/common/src/flex/messaging/util/PrettyPrintable.java b/common/src/main/java/flex/messaging/util/PrettyPrintable.java
similarity index 100%
rename from common/src/flex/messaging/util/PrettyPrintable.java
rename to common/src/main/java/flex/messaging/util/PrettyPrintable.java
diff --git a/common/src/flex/messaging/util/PrettyPrinter.java b/common/src/main/java/flex/messaging/util/PrettyPrinter.java
similarity index 100%
rename from common/src/flex/messaging/util/PrettyPrinter.java
rename to common/src/main/java/flex/messaging/util/PrettyPrinter.java
diff --git a/common/src/flex/messaging/util/PropertyStringResourceLoader.java b/common/src/main/java/flex/messaging/util/PropertyStringResourceLoader.java
similarity index 100%
rename from common/src/flex/messaging/util/PropertyStringResourceLoader.java
rename to common/src/main/java/flex/messaging/util/PropertyStringResourceLoader.java
diff --git a/common/src/flex/messaging/util/ResourceLoader.java b/common/src/main/java/flex/messaging/util/ResourceLoader.java
similarity index 100%
rename from common/src/flex/messaging/util/ResourceLoader.java
rename to common/src/main/java/flex/messaging/util/ResourceLoader.java
diff --git a/common/src/flex/messaging/util/StringUtils.java b/common/src/main/java/flex/messaging/util/StringUtils.java
similarity index 100%
rename from common/src/flex/messaging/util/StringUtils.java
rename to common/src/main/java/flex/messaging/util/StringUtils.java
diff --git a/common/src/flex/messaging/util/UUIDUtils.java b/common/src/main/java/flex/messaging/util/UUIDUtils.java
similarity index 100%
rename from common/src/flex/messaging/util/UUIDUtils.java
rename to common/src/main/java/flex/messaging/util/UUIDUtils.java
diff --git a/common/src/flex/messaging/errors.properties b/common/src/main/resources/flex/messaging/errors.properties
similarity index 100%
rename from common/src/flex/messaging/errors.properties
rename to common/src/main/resources/flex/messaging/errors.properties
diff --git a/core/pom.xml b/core/pom.xml
index 0293d62..5a642bf 100755
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -16,79 +16,68 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.flex.blazeds</groupId>
- <artifactId>blazeds</artifactId>
- <version>4.7.3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
+ <parent>
+ <groupId>org.apache.flex.blazeds</groupId>
+ <artifactId>blazeds</artifactId>
+ <version>4.7.3-SNAPSHOT</version>
+ </parent>
- <artifactId>flex-messaging-core</artifactId>
+ <artifactId>flex-messaging-core</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.blazeds</groupId>
- <artifactId>flex-messaging-common</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.blazeds</groupId>
+ <artifactId>flex-messaging-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.7.0</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ <optional>true</optional>
+ </dependency>
- <dependency>
- <groupId>jgroups</groupId>
- <artifactId>jgroups</artifactId>
- <version>2.9.0.GA</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ <optional>true</optional>
+ </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
- <dependency>
- <groupId>javax.jms</groupId>
- <artifactId>jms-api</artifactId>
- <version>1.1-rev-1</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>javax.jms</groupId>
+ <artifactId>javax.jms-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
- <build>
- <sourceDirectory>src</sourceDirectory>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- <version>2.5</version>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <id>javacc</id>
- <goals>
- <goal>javacc</goal>
- </goals>
- <configuration>
- <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
- <outputDirectory>${project.build.sourceDirectory}</outputDirectory>
- <!--
- it will generate the source in the same folder, the generated
- files need to be added to .svn:ignore
- -->
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>9.1.0.v20131115</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>9.1.0.v20131115</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
</project>
diff --git a/core/src/flex/management/BaseControl.java b/core/src/main/java/flex/management/BaseControl.java
similarity index 100%
rename from core/src/flex/management/BaseControl.java
rename to core/src/main/java/flex/management/BaseControl.java
diff --git a/core/src/flex/management/BaseControlMBean.java b/core/src/main/java/flex/management/BaseControlMBean.java
similarity index 100%
rename from core/src/flex/management/BaseControlMBean.java
rename to core/src/main/java/flex/management/BaseControlMBean.java
diff --git a/core/src/flex/management/MBeanLifecycleManager.java b/core/src/main/java/flex/management/MBeanLifecycleManager.java
similarity index 100%
rename from core/src/flex/management/MBeanLifecycleManager.java
rename to core/src/main/java/flex/management/MBeanLifecycleManager.java
diff --git a/core/src/flex/management/MBeanServerLocator.java b/core/src/main/java/flex/management/MBeanServerLocator.java
similarity index 100%
rename from core/src/flex/management/MBeanServerLocator.java
rename to core/src/main/java/flex/management/MBeanServerLocator.java
diff --git a/core/src/flex/management/MBeanServerLocatorFactory.java b/core/src/main/java/flex/management/MBeanServerLocatorFactory.java
similarity index 100%
rename from core/src/flex/management/MBeanServerLocatorFactory.java
rename to core/src/main/java/flex/management/MBeanServerLocatorFactory.java
diff --git a/core/src/flex/management/Manageable.java b/core/src/main/java/flex/management/Manageable.java
similarity index 100%
rename from core/src/flex/management/Manageable.java
rename to core/src/main/java/flex/management/Manageable.java
diff --git a/core/src/flex/management/ManageableComponent.java b/core/src/main/java/flex/management/ManageableComponent.java
similarity index 100%
rename from core/src/flex/management/ManageableComponent.java
rename to core/src/main/java/flex/management/ManageableComponent.java
diff --git a/core/src/flex/management/ManagementException.java b/core/src/main/java/flex/management/ManagementException.java
similarity index 100%
rename from core/src/flex/management/ManagementException.java
rename to core/src/main/java/flex/management/ManagementException.java
diff --git a/core/src/flex/management/PlatformMBeanServerLocator.java b/core/src/main/java/flex/management/PlatformMBeanServerLocator.java
similarity index 100%
rename from core/src/flex/management/PlatformMBeanServerLocator.java
rename to core/src/main/java/flex/management/PlatformMBeanServerLocator.java
diff --git a/core/src/flex/management/jmx/Attribute.java b/core/src/main/java/flex/management/jmx/Attribute.java
similarity index 100%
rename from core/src/flex/management/jmx/Attribute.java
rename to core/src/main/java/flex/management/jmx/Attribute.java
diff --git a/core/src/flex/management/jmx/MBeanAttributeInfo.java b/core/src/main/java/flex/management/jmx/MBeanAttributeInfo.java
similarity index 100%
rename from core/src/flex/management/jmx/MBeanAttributeInfo.java
rename to core/src/main/java/flex/management/jmx/MBeanAttributeInfo.java
diff --git a/core/src/flex/management/jmx/MBeanConstructorInfo.java b/core/src/main/java/flex/management/jmx/MBeanConstructorInfo.java
similarity index 100%
rename from core/src/flex/management/jmx/MBeanConstructorInfo.java
rename to core/src/main/java/flex/management/jmx/MBeanConstructorInfo.java
diff --git a/core/src/flex/management/jmx/MBeanInfo.java b/core/src/main/java/flex/management/jmx/MBeanInfo.java
similarity index 100%
rename from core/src/flex/management/jmx/MBeanInfo.java
rename to core/src/main/java/flex/management/jmx/MBeanInfo.java
diff --git a/core/src/flex/management/jmx/MBeanOperationInfo.java b/core/src/main/java/flex/management/jmx/MBeanOperationInfo.java
similarity index 100%
rename from core/src/flex/management/jmx/MBeanOperationInfo.java
rename to core/src/main/java/flex/management/jmx/MBeanOperationInfo.java
diff --git a/core/src/flex/management/jmx/MBeanParameterInfo.java b/core/src/main/java/flex/management/jmx/MBeanParameterInfo.java
similarity index 100%
rename from core/src/flex/management/jmx/MBeanParameterInfo.java
rename to core/src/main/java/flex/management/jmx/MBeanParameterInfo.java
diff --git a/core/src/flex/management/jmx/MBeanServerGateway.java b/core/src/main/java/flex/management/jmx/MBeanServerGateway.java
similarity index 100%
rename from core/src/flex/management/jmx/MBeanServerGateway.java
rename to core/src/main/java/flex/management/jmx/MBeanServerGateway.java
diff --git a/core/src/flex/management/jmx/ObjectInstance.java b/core/src/main/java/flex/management/jmx/ObjectInstance.java
similarity index 100%
rename from core/src/flex/management/jmx/ObjectInstance.java
rename to core/src/main/java/flex/management/jmx/ObjectInstance.java
diff --git a/core/src/flex/management/jmx/ObjectName.java b/core/src/main/java/flex/management/jmx/ObjectName.java
similarity index 100%
rename from core/src/flex/management/jmx/ObjectName.java
rename to core/src/main/java/flex/management/jmx/ObjectName.java
diff --git a/core/src/flex/management/jmx/package-info.java b/core/src/main/java/flex/management/jmx/package-info.java
similarity index 100%
rename from core/src/flex/management/jmx/package-info.java
rename to core/src/main/java/flex/management/jmx/package-info.java
diff --git a/core/src/flex/management/package-info.java b/core/src/main/java/flex/management/package-info.java
similarity index 100%
rename from core/src/flex/management/package-info.java
rename to core/src/main/java/flex/management/package-info.java
diff --git a/core/src/flex/management/runtime/AdminConsoleDisplayRegistrar.java b/core/src/main/java/flex/management/runtime/AdminConsoleDisplayRegistrar.java
similarity index 100%
rename from core/src/flex/management/runtime/AdminConsoleDisplayRegistrar.java
rename to core/src/main/java/flex/management/runtime/AdminConsoleDisplayRegistrar.java
diff --git a/core/src/flex/management/runtime/AdminConsoleDisplayRegistrarMBean.java b/core/src/main/java/flex/management/runtime/AdminConsoleDisplayRegistrarMBean.java
similarity index 100%
rename from core/src/flex/management/runtime/AdminConsoleDisplayRegistrarMBean.java
rename to core/src/main/java/flex/management/runtime/AdminConsoleDisplayRegistrarMBean.java
diff --git a/core/src/flex/management/runtime/AdminConsoleTypes.java b/core/src/main/java/flex/management/runtime/AdminConsoleTypes.java
similarity index 100%
rename from core/src/flex/management/runtime/AdminConsoleTypes.java
rename to core/src/main/java/flex/management/runtime/AdminConsoleTypes.java
diff --git a/core/src/flex/management/runtime/messaging/DestinationControl.java b/core/src/main/java/flex/management/runtime/messaging/DestinationControl.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/DestinationControl.java
rename to core/src/main/java/flex/management/runtime/messaging/DestinationControl.java
diff --git a/core/src/flex/management/runtime/messaging/DestinationControlMBean.java b/core/src/main/java/flex/management/runtime/messaging/DestinationControlMBean.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/DestinationControlMBean.java
rename to core/src/main/java/flex/management/runtime/messaging/DestinationControlMBean.java
diff --git a/core/src/flex/management/runtime/messaging/MessageBrokerControl.java b/core/src/main/java/flex/management/runtime/messaging/MessageBrokerControl.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/MessageBrokerControl.java
rename to core/src/main/java/flex/management/runtime/messaging/MessageBrokerControl.java
diff --git a/core/src/flex/management/runtime/messaging/MessageBrokerControlMBean.java b/core/src/main/java/flex/management/runtime/messaging/MessageBrokerControlMBean.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/MessageBrokerControlMBean.java
rename to core/src/main/java/flex/management/runtime/messaging/MessageBrokerControlMBean.java
diff --git a/core/src/flex/management/runtime/messaging/MessageDestinationControl.java b/core/src/main/java/flex/management/runtime/messaging/MessageDestinationControl.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/MessageDestinationControl.java
rename to core/src/main/java/flex/management/runtime/messaging/MessageDestinationControl.java
diff --git a/core/src/flex/management/runtime/messaging/MessageDestinationControlMBean.java b/core/src/main/java/flex/management/runtime/messaging/MessageDestinationControlMBean.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/MessageDestinationControlMBean.java
rename to core/src/main/java/flex/management/runtime/messaging/MessageDestinationControlMBean.java
diff --git a/core/src/flex/management/runtime/messaging/client/FlexClientManagerControl.java b/core/src/main/java/flex/management/runtime/messaging/client/FlexClientManagerControl.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/client/FlexClientManagerControl.java
rename to core/src/main/java/flex/management/runtime/messaging/client/FlexClientManagerControl.java
diff --git a/core/src/flex/management/runtime/messaging/client/FlexClientManagerControlMBean.java b/core/src/main/java/flex/management/runtime/messaging/client/FlexClientManagerControlMBean.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/client/FlexClientManagerControlMBean.java
rename to core/src/main/java/flex/management/runtime/messaging/client/FlexClientManagerControlMBean.java
diff --git a/core/src/flex/management/runtime/messaging/client/package-info.java b/core/src/main/java/flex/management/runtime/messaging/client/package-info.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/client/package-info.java
rename to core/src/main/java/flex/management/runtime/messaging/client/package-info.java
diff --git a/core/src/flex/management/runtime/messaging/endpoints/AMFEndpointControl.java b/core/src/main/java/flex/management/runtime/messaging/endpoints/AMFEndpointControl.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/endpoints/AMFEndpointControl.java
rename to core/src/main/java/flex/management/runtime/messaging/endpoints/AMFEndpointControl.java
diff --git a/core/src/flex/management/runtime/messaging/endpoints/AMFEndpointControlMBean.java b/core/src/main/java/flex/management/runtime/messaging/endpoints/AMFEndpointControlMBean.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/endpoints/AMFEndpointControlMBean.java
rename to core/src/main/java/flex/management/runtime/messaging/endpoints/AMFEndpointControlMBean.java
diff --git a/core/src/flex/management/runtime/messaging/endpoints/EndpointControl.java b/core/src/main/java/flex/management/runtime/messaging/endpoints/EndpointControl.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/endpoints/EndpointControl.java
rename to core/src/main/java/flex/management/runtime/messaging/endpoints/EndpointControl.java
diff --git a/core/src/flex/management/runtime/messaging/endpoints/EndpointControlMBean.java b/core/src/main/java/flex/management/runtime/messaging/endpoints/EndpointControlMBean.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/endpoints/EndpointControlMBean.java
rename to core/src/main/java/flex/management/runtime/messaging/endpoints/EndpointControlMBean.java
diff --git a/core/src/flex/management/runtime/messaging/endpoints/HTTPEndpointControl.java b/core/src/main/java/flex/management/runtime/messaging/endpoints/HTTPEndpointControl.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/endpoints/HTTPEndpointControl.java
rename to core/src/main/java/flex/management/runtime/messaging/endpoints/HTTPEndpointControl.java
diff --git a/core/src/flex/management/runtime/messaging/endpoints/HTTPEndpointControlMBean.java b/core/src/main/java/flex/management/runtime/messaging/endpoints/HTTPEndpointControlMBean.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/endpoints/HTTPEndpointControlMBean.java
rename to core/src/main/java/flex/management/runtime/messaging/endpoints/HTTPEndpointControlMBean.java
diff --git a/core/src/flex/management/runtime/messaging/endpoints/PollingEndpointControl.java b/core/src/main/java/flex/management/runtime/messaging/endpoints/PollingEndpointControl.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/endpoints/PollingEndpointControl.java
rename to core/src/main/java/flex/management/runtime/messaging/endpoints/PollingEndpointControl.java
diff --git a/core/src/flex/management/runtime/messaging/endpoints/PollingEndpointControlMBean.java b/core/src/main/java/flex/management/runtime/messaging/endpoints/PollingEndpointControlMBean.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/endpoints/PollingEndpointControlMBean.java
rename to core/src/main/java/flex/management/runtime/messaging/endpoints/PollingEndpointControlMBean.java
diff --git a/core/src/flex/management/runtime/messaging/endpoints/StreamingAMFEndpointControl.java b/core/src/main/java/flex/management/runtime/messaging/endpoints/StreamingAMFEndpointControl.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/endpoints/StreamingAMFEndpointControl.java
rename to core/src/main/java/flex/management/runtime/messaging/endpoints/StreamingAMFEndpointControl.java
diff --git a/core/src/flex/management/runtime/messaging/endpoints/StreamingAMFEndpointControlMBean.java b/core/src/main/java/flex/management/runtime/messaging/endpoints/StreamingAMFEndpointControlMBean.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/endpoints/StreamingAMFEndpointControlMBean.java
rename to core/src/main/java/flex/management/runtime/messaging/endpoints/StreamingAMFEndpointControlMBean.java
diff --git a/core/src/flex/management/runtime/messaging/endpoints/StreamingEndpointControl.java b/core/src/main/java/flex/management/runtime/messaging/endpoints/StreamingEndpointControl.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/endpoints/StreamingEndpointControl.java
rename to core/src/main/java/flex/management/runtime/messaging/endpoints/StreamingEndpointControl.java
diff --git a/core/src/flex/management/runtime/messaging/endpoints/StreamingEndpointControlMBean.java b/core/src/main/java/flex/management/runtime/messaging/endpoints/StreamingEndpointControlMBean.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/endpoints/StreamingEndpointControlMBean.java
rename to core/src/main/java/flex/management/runtime/messaging/endpoints/StreamingEndpointControlMBean.java
diff --git a/core/src/flex/management/runtime/messaging/endpoints/StreamingHTTPEndpointControl.java b/core/src/main/java/flex/management/runtime/messaging/endpoints/StreamingHTTPEndpointControl.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/endpoints/StreamingHTTPEndpointControl.java
rename to core/src/main/java/flex/management/runtime/messaging/endpoints/StreamingHTTPEndpointControl.java
diff --git a/core/src/flex/management/runtime/messaging/endpoints/StreamingHTTPEndpointControlMBean.java b/core/src/main/java/flex/management/runtime/messaging/endpoints/StreamingHTTPEndpointControlMBean.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/endpoints/StreamingHTTPEndpointControlMBean.java
rename to core/src/main/java/flex/management/runtime/messaging/endpoints/StreamingHTTPEndpointControlMBean.java
diff --git a/core/src/flex/management/runtime/messaging/endpoints/package-info.java b/core/src/main/java/flex/management/runtime/messaging/endpoints/package-info.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/endpoints/package-info.java
rename to core/src/main/java/flex/management/runtime/messaging/endpoints/package-info.java
diff --git a/core/src/flex/management/runtime/messaging/log/LogControl.java b/core/src/main/java/flex/management/runtime/messaging/log/LogControl.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/log/LogControl.java
rename to core/src/main/java/flex/management/runtime/messaging/log/LogControl.java
diff --git a/core/src/flex/management/runtime/messaging/log/LogControlMBean.java b/core/src/main/java/flex/management/runtime/messaging/log/LogControlMBean.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/log/LogControlMBean.java
rename to core/src/main/java/flex/management/runtime/messaging/log/LogControlMBean.java
diff --git a/core/src/flex/management/runtime/messaging/log/LogManager.java b/core/src/main/java/flex/management/runtime/messaging/log/LogManager.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/log/LogManager.java
rename to core/src/main/java/flex/management/runtime/messaging/log/LogManager.java
diff --git a/core/src/flex/management/runtime/messaging/log/package-info.java b/core/src/main/java/flex/management/runtime/messaging/log/package-info.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/log/package-info.java
rename to core/src/main/java/flex/management/runtime/messaging/log/package-info.java
diff --git a/core/src/flex/management/runtime/messaging/package-info.java b/core/src/main/java/flex/management/runtime/messaging/package-info.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/package-info.java
rename to core/src/main/java/flex/management/runtime/messaging/package-info.java
diff --git a/core/src/flex/management/runtime/messaging/services/MessageServiceControl.java b/core/src/main/java/flex/management/runtime/messaging/services/MessageServiceControl.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/services/MessageServiceControl.java
rename to core/src/main/java/flex/management/runtime/messaging/services/MessageServiceControl.java
diff --git a/core/src/flex/management/runtime/messaging/services/MessageServiceControlMBean.java b/core/src/main/java/flex/management/runtime/messaging/services/MessageServiceControlMBean.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/services/MessageServiceControlMBean.java
rename to core/src/main/java/flex/management/runtime/messaging/services/MessageServiceControlMBean.java
diff --git a/core/src/flex/management/runtime/messaging/services/ServiceAdapterControl.java b/core/src/main/java/flex/management/runtime/messaging/services/ServiceAdapterControl.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/services/ServiceAdapterControl.java
rename to core/src/main/java/flex/management/runtime/messaging/services/ServiceAdapterControl.java
diff --git a/core/src/flex/management/runtime/messaging/services/ServiceAdapterControlMBean.java b/core/src/main/java/flex/management/runtime/messaging/services/ServiceAdapterControlMBean.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/services/ServiceAdapterControlMBean.java
rename to core/src/main/java/flex/management/runtime/messaging/services/ServiceAdapterControlMBean.java
diff --git a/core/src/flex/management/runtime/messaging/services/ServiceControl.java b/core/src/main/java/flex/management/runtime/messaging/services/ServiceControl.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/services/ServiceControl.java
rename to core/src/main/java/flex/management/runtime/messaging/services/ServiceControl.java
diff --git a/core/src/flex/management/runtime/messaging/services/ServiceControlMBean.java b/core/src/main/java/flex/management/runtime/messaging/services/ServiceControlMBean.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/services/ServiceControlMBean.java
rename to core/src/main/java/flex/management/runtime/messaging/services/ServiceControlMBean.java
diff --git a/core/src/flex/management/runtime/messaging/services/messaging/SubscriptionManagerControl.java b/core/src/main/java/flex/management/runtime/messaging/services/messaging/SubscriptionManagerControl.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/services/messaging/SubscriptionManagerControl.java
rename to core/src/main/java/flex/management/runtime/messaging/services/messaging/SubscriptionManagerControl.java
diff --git a/core/src/flex/management/runtime/messaging/services/messaging/SubscriptionManagerControlMBean.java b/core/src/main/java/flex/management/runtime/messaging/services/messaging/SubscriptionManagerControlMBean.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/services/messaging/SubscriptionManagerControlMBean.java
rename to core/src/main/java/flex/management/runtime/messaging/services/messaging/SubscriptionManagerControlMBean.java
diff --git a/core/src/flex/management/runtime/messaging/services/messaging/ThrottleManagerControl.java b/core/src/main/java/flex/management/runtime/messaging/services/messaging/ThrottleManagerControl.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/services/messaging/ThrottleManagerControl.java
rename to core/src/main/java/flex/management/runtime/messaging/services/messaging/ThrottleManagerControl.java
diff --git a/core/src/flex/management/runtime/messaging/services/messaging/ThrottleManagerControlMBean.java b/core/src/main/java/flex/management/runtime/messaging/services/messaging/ThrottleManagerControlMBean.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/services/messaging/ThrottleManagerControlMBean.java
rename to core/src/main/java/flex/management/runtime/messaging/services/messaging/ThrottleManagerControlMBean.java
diff --git a/core/src/flex/management/runtime/messaging/services/messaging/adapters/ActionScriptAdapterControl.java b/core/src/main/java/flex/management/runtime/messaging/services/messaging/adapters/ActionScriptAdapterControl.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/services/messaging/adapters/ActionScriptAdapterControl.java
rename to core/src/main/java/flex/management/runtime/messaging/services/messaging/adapters/ActionScriptAdapterControl.java
diff --git a/core/src/flex/management/runtime/messaging/services/messaging/adapters/ActionScriptAdapterControlMBean.java b/core/src/main/java/flex/management/runtime/messaging/services/messaging/adapters/ActionScriptAdapterControlMBean.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/services/messaging/adapters/ActionScriptAdapterControlMBean.java
rename to core/src/main/java/flex/management/runtime/messaging/services/messaging/adapters/ActionScriptAdapterControlMBean.java
diff --git a/core/src/flex/management/runtime/messaging/services/messaging/adapters/JMSAdapterControl.java b/core/src/main/java/flex/management/runtime/messaging/services/messaging/adapters/JMSAdapterControl.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/services/messaging/adapters/JMSAdapterControl.java
rename to core/src/main/java/flex/management/runtime/messaging/services/messaging/adapters/JMSAdapterControl.java
diff --git a/core/src/flex/management/runtime/messaging/services/messaging/adapters/JMSAdapterControlMBean.java b/core/src/main/java/flex/management/runtime/messaging/services/messaging/adapters/JMSAdapterControlMBean.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/services/messaging/adapters/JMSAdapterControlMBean.java
rename to core/src/main/java/flex/management/runtime/messaging/services/messaging/adapters/JMSAdapterControlMBean.java
diff --git a/core/src/flex/management/runtime/messaging/services/messaging/adapters/package-info.java b/core/src/main/java/flex/management/runtime/messaging/services/messaging/adapters/package-info.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/services/messaging/adapters/package-info.java
rename to core/src/main/java/flex/management/runtime/messaging/services/messaging/adapters/package-info.java
diff --git a/core/src/flex/management/runtime/messaging/services/messaging/package-info.java b/core/src/main/java/flex/management/runtime/messaging/services/messaging/package-info.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/services/messaging/package-info.java
rename to core/src/main/java/flex/management/runtime/messaging/services/messaging/package-info.java
diff --git a/core/src/flex/management/runtime/messaging/services/package-info.java b/core/src/main/java/flex/management/runtime/messaging/services/package-info.java
similarity index 100%
rename from core/src/flex/management/runtime/messaging/services/package-info.java
rename to core/src/main/java/flex/management/runtime/messaging/services/package-info.java
diff --git a/core/src/flex/management/runtime/package-info.java b/core/src/main/java/flex/management/runtime/package-info.java
similarity index 100%
rename from core/src/flex/management/runtime/package-info.java
rename to core/src/main/java/flex/management/runtime/package-info.java
diff --git a/core/src/flex/messaging/AbstractConnectionAwareSession.java b/core/src/main/java/flex/messaging/AbstractConnectionAwareSession.java
similarity index 100%
rename from core/src/flex/messaging/AbstractConnectionAwareSession.java
rename to core/src/main/java/flex/messaging/AbstractConnectionAwareSession.java
diff --git a/core/src/flex/messaging/AbstractFlexSessionProvider.java b/core/src/main/java/flex/messaging/AbstractFlexSessionProvider.java
similarity index 100%
rename from core/src/flex/messaging/AbstractFlexSessionProvider.java
rename to core/src/main/java/flex/messaging/AbstractFlexSessionProvider.java
diff --git a/core/src/flex/messaging/ConnectionAwareSession.java b/core/src/main/java/flex/messaging/ConnectionAwareSession.java
similarity index 100%
rename from core/src/flex/messaging/ConnectionAwareSession.java
rename to core/src/main/java/flex/messaging/ConnectionAwareSession.java
diff --git a/core/src/flex/messaging/Destination.java b/core/src/main/java/flex/messaging/Destination.java
similarity index 100%
rename from core/src/flex/messaging/Destination.java
rename to core/src/main/java/flex/messaging/Destination.java
diff --git a/core/src/flex/messaging/DestructibleFlexFactory.java b/core/src/main/java/flex/messaging/DestructibleFlexFactory.java
similarity index 100%
rename from core/src/flex/messaging/DestructibleFlexFactory.java
rename to core/src/main/java/flex/messaging/DestructibleFlexFactory.java
diff --git a/core/src/flex/messaging/FactoryDestination.java b/core/src/main/java/flex/messaging/FactoryDestination.java
similarity index 100%
rename from core/src/flex/messaging/FactoryDestination.java
rename to core/src/main/java/flex/messaging/FactoryDestination.java
diff --git a/core/src/flex/messaging/FactoryInstance.java b/core/src/main/java/flex/messaging/FactoryInstance.java
similarity index 100%
rename from core/src/flex/messaging/FactoryInstance.java
rename to core/src/main/java/flex/messaging/FactoryInstance.java
diff --git a/core/src/flex/messaging/FlexComponent.java b/core/src/main/java/flex/messaging/FlexComponent.java
similarity index 100%
rename from core/src/flex/messaging/FlexComponent.java
rename to core/src/main/java/flex/messaging/FlexComponent.java
diff --git a/core/src/flex/messaging/FlexConfigurable.java b/core/src/main/java/flex/messaging/FlexConfigurable.java
similarity index 100%
rename from core/src/flex/messaging/FlexConfigurable.java
rename to core/src/main/java/flex/messaging/FlexConfigurable.java
diff --git a/core/src/flex/messaging/FlexContext.java b/core/src/main/java/flex/messaging/FlexContext.java
similarity index 100%
rename from core/src/flex/messaging/FlexContext.java
rename to core/src/main/java/flex/messaging/FlexContext.java
diff --git a/core/src/flex/messaging/FlexFactory.java b/core/src/main/java/flex/messaging/FlexFactory.java
similarity index 100%
rename from core/src/flex/messaging/FlexFactory.java
rename to core/src/main/java/flex/messaging/FlexFactory.java
diff --git a/core/src/flex/messaging/FlexRemoteCredentials.java b/core/src/main/java/flex/messaging/FlexRemoteCredentials.java
similarity index 100%
rename from core/src/flex/messaging/FlexRemoteCredentials.java
rename to core/src/main/java/flex/messaging/FlexRemoteCredentials.java
diff --git a/core/src/flex/messaging/FlexSession.java b/core/src/main/java/flex/messaging/FlexSession.java
similarity index 100%
rename from core/src/flex/messaging/FlexSession.java
rename to core/src/main/java/flex/messaging/FlexSession.java
diff --git a/core/src/flex/messaging/FlexSessionAttributeListener.java b/core/src/main/java/flex/messaging/FlexSessionAttributeListener.java
similarity index 100%
rename from core/src/flex/messaging/FlexSessionAttributeListener.java
rename to core/src/main/java/flex/messaging/FlexSessionAttributeListener.java
diff --git a/core/src/flex/messaging/FlexSessionBindingEvent.java b/core/src/main/java/flex/messaging/FlexSessionBindingEvent.java
similarity index 100%
rename from core/src/flex/messaging/FlexSessionBindingEvent.java
rename to core/src/main/java/flex/messaging/FlexSessionBindingEvent.java
diff --git a/core/src/flex/messaging/FlexSessionBindingListener.java b/core/src/main/java/flex/messaging/FlexSessionBindingListener.java
similarity index 100%
rename from core/src/flex/messaging/FlexSessionBindingListener.java
rename to core/src/main/java/flex/messaging/FlexSessionBindingListener.java
diff --git a/core/src/flex/messaging/FlexSessionConnectivityEvent.java b/core/src/main/java/flex/messaging/FlexSessionConnectivityEvent.java
similarity index 100%
rename from core/src/flex/messaging/FlexSessionConnectivityEvent.java
rename to core/src/main/java/flex/messaging/FlexSessionConnectivityEvent.java
diff --git a/core/src/flex/messaging/FlexSessionConnectivityListener.java b/core/src/main/java/flex/messaging/FlexSessionConnectivityListener.java
similarity index 100%
rename from core/src/flex/messaging/FlexSessionConnectivityListener.java
rename to core/src/main/java/flex/messaging/FlexSessionConnectivityListener.java
diff --git a/core/src/flex/messaging/FlexSessionListener.java b/core/src/main/java/flex/messaging/FlexSessionListener.java
similarity index 100%
rename from core/src/flex/messaging/FlexSessionListener.java
rename to core/src/main/java/flex/messaging/FlexSessionListener.java
diff --git a/core/src/flex/messaging/FlexSessionManager.java b/core/src/main/java/flex/messaging/FlexSessionManager.java
similarity index 100%
rename from core/src/flex/messaging/FlexSessionManager.java
rename to core/src/main/java/flex/messaging/FlexSessionManager.java
diff --git a/core/src/flex/messaging/HttpFlexSession.java b/core/src/main/java/flex/messaging/HttpFlexSession.java
similarity index 100%
rename from core/src/flex/messaging/HttpFlexSession.java
rename to core/src/main/java/flex/messaging/HttpFlexSession.java
diff --git a/core/src/flex/messaging/HttpFlexSessionProvider.java b/core/src/main/java/flex/messaging/HttpFlexSessionProvider.java
similarity index 100%
rename from core/src/flex/messaging/HttpFlexSessionProvider.java
rename to core/src/main/java/flex/messaging/HttpFlexSessionProvider.java
diff --git a/core/src/flex/messaging/MessageBroker.java b/core/src/main/java/flex/messaging/MessageBroker.java
similarity index 100%
rename from core/src/flex/messaging/MessageBroker.java
rename to core/src/main/java/flex/messaging/MessageBroker.java
diff --git a/core/src/flex/messaging/MessageBrokerServlet.java b/core/src/main/java/flex/messaging/MessageBrokerServlet.java
similarity index 100%
rename from core/src/flex/messaging/MessageBrokerServlet.java
rename to core/src/main/java/flex/messaging/MessageBrokerServlet.java
diff --git a/core/src/flex/messaging/MessageClient.java b/core/src/main/java/flex/messaging/MessageClient.java
similarity index 100%
rename from core/src/flex/messaging/MessageClient.java
rename to core/src/main/java/flex/messaging/MessageClient.java
diff --git a/core/src/flex/messaging/MessageClientListener.java b/core/src/main/java/flex/messaging/MessageClientListener.java
similarity index 100%
rename from core/src/flex/messaging/MessageClientListener.java
rename to core/src/main/java/flex/messaging/MessageClientListener.java
diff --git a/core/src/flex/messaging/MessageDestination.java b/core/src/main/java/flex/messaging/MessageDestination.java
similarity index 100%
rename from core/src/flex/messaging/MessageDestination.java
rename to core/src/main/java/flex/messaging/MessageDestination.java
diff --git a/core/src/flex/messaging/MessageException.java b/core/src/main/java/flex/messaging/MessageException.java
similarity index 100%
rename from core/src/flex/messaging/MessageException.java
rename to core/src/main/java/flex/messaging/MessageException.java
diff --git a/core/src/flex/messaging/MessageRoutedEvent.java b/core/src/main/java/flex/messaging/MessageRoutedEvent.java
similarity index 100%
rename from core/src/flex/messaging/MessageRoutedEvent.java
rename to core/src/main/java/flex/messaging/MessageRoutedEvent.java
diff --git a/core/src/flex/messaging/MessageRoutedListener.java b/core/src/main/java/flex/messaging/MessageRoutedListener.java
similarity index 100%
rename from core/src/flex/messaging/MessageRoutedListener.java
rename to core/src/main/java/flex/messaging/MessageRoutedListener.java
diff --git a/core/src/flex/messaging/MessageRoutedNotifier.java b/core/src/main/java/flex/messaging/MessageRoutedNotifier.java
similarity index 100%
rename from core/src/flex/messaging/MessageRoutedNotifier.java
rename to core/src/main/java/flex/messaging/MessageRoutedNotifier.java
diff --git a/core/src/flex/messaging/Server.java b/core/src/main/java/flex/messaging/Server.java
similarity index 100%
rename from core/src/flex/messaging/Server.java
rename to core/src/main/java/flex/messaging/Server.java
diff --git a/core/src/flex/messaging/ServiceValidationListener.java b/core/src/main/java/flex/messaging/ServiceValidationListener.java
similarity index 100%
rename from core/src/flex/messaging/ServiceValidationListener.java
rename to core/src/main/java/flex/messaging/ServiceValidationListener.java
diff --git a/core/src/flex/messaging/VersionInfo.java b/core/src/main/java/flex/messaging/VersionInfo.java
similarity index 100%
rename from core/src/flex/messaging/VersionInfo.java
rename to core/src/main/java/flex/messaging/VersionInfo.java
diff --git a/core/src/flex/messaging/client/AsyncPollHandler.java b/core/src/main/java/flex/messaging/client/AsyncPollHandler.java
similarity index 100%
rename from core/src/flex/messaging/client/AsyncPollHandler.java
rename to core/src/main/java/flex/messaging/client/AsyncPollHandler.java
diff --git a/core/src/flex/messaging/client/EndpointPushHandler.java b/core/src/main/java/flex/messaging/client/EndpointPushHandler.java
similarity index 100%
rename from core/src/flex/messaging/client/EndpointPushHandler.java
rename to core/src/main/java/flex/messaging/client/EndpointPushHandler.java
diff --git a/core/src/flex/messaging/client/EndpointPushNotifier.java b/core/src/main/java/flex/messaging/client/EndpointPushNotifier.java
similarity index 100%
rename from core/src/flex/messaging/client/EndpointPushNotifier.java
rename to core/src/main/java/flex/messaging/client/EndpointPushNotifier.java
diff --git a/core/src/flex/messaging/client/FlexClient.java b/core/src/main/java/flex/messaging/client/FlexClient.java
similarity index 100%
rename from core/src/flex/messaging/client/FlexClient.java
rename to core/src/main/java/flex/messaging/client/FlexClient.java
diff --git a/core/src/flex/messaging/client/FlexClientAttributeListener.java b/core/src/main/java/flex/messaging/client/FlexClientAttributeListener.java
similarity index 100%
rename from core/src/flex/messaging/client/FlexClientAttributeListener.java
rename to core/src/main/java/flex/messaging/client/FlexClientAttributeListener.java
diff --git a/core/src/flex/messaging/client/FlexClientBindingEvent.java b/core/src/main/java/flex/messaging/client/FlexClientBindingEvent.java
similarity index 100%
rename from core/src/flex/messaging/client/FlexClientBindingEvent.java
rename to core/src/main/java/flex/messaging/client/FlexClientBindingEvent.java
diff --git a/core/src/flex/messaging/client/FlexClientBindingListener.java b/core/src/main/java/flex/messaging/client/FlexClientBindingListener.java
similarity index 100%
rename from core/src/flex/messaging/client/FlexClientBindingListener.java
rename to core/src/main/java/flex/messaging/client/FlexClientBindingListener.java
diff --git a/core/src/flex/messaging/client/FlexClientListener.java b/core/src/main/java/flex/messaging/client/FlexClientListener.java
similarity index 100%
rename from core/src/flex/messaging/client/FlexClientListener.java
rename to core/src/main/java/flex/messaging/client/FlexClientListener.java
diff --git a/core/src/flex/messaging/client/FlexClientManager.java b/core/src/main/java/flex/messaging/client/FlexClientManager.java
similarity index 100%
rename from core/src/flex/messaging/client/FlexClientManager.java
rename to core/src/main/java/flex/messaging/client/FlexClientManager.java
diff --git a/core/src/flex/messaging/client/FlexClientNotSubscribedException.java b/core/src/main/java/flex/messaging/client/FlexClientNotSubscribedException.java
similarity index 100%
rename from core/src/flex/messaging/client/FlexClientNotSubscribedException.java
rename to core/src/main/java/flex/messaging/client/FlexClientNotSubscribedException.java
diff --git a/core/src/flex/messaging/client/FlexClientOutboundQueueProcessor.java b/core/src/main/java/flex/messaging/client/FlexClientOutboundQueueProcessor.java
similarity index 100%
rename from core/src/flex/messaging/client/FlexClientOutboundQueueProcessor.java
rename to core/src/main/java/flex/messaging/client/FlexClientOutboundQueueProcessor.java
diff --git a/core/src/flex/messaging/client/FlushResult.java b/core/src/main/java/flex/messaging/client/FlushResult.java
similarity index 100%
rename from core/src/flex/messaging/client/FlushResult.java
rename to core/src/main/java/flex/messaging/client/FlushResult.java
diff --git a/core/src/flex/messaging/client/OutboundQueueThrottleManager.java b/core/src/main/java/flex/messaging/client/OutboundQueueThrottleManager.java
similarity index 100%
rename from core/src/flex/messaging/client/OutboundQueueThrottleManager.java
rename to core/src/main/java/flex/messaging/client/OutboundQueueThrottleManager.java
diff --git a/core/src/flex/messaging/client/PollFlushResult.java b/core/src/main/java/flex/messaging/client/PollFlushResult.java
similarity index 100%
rename from core/src/flex/messaging/client/PollFlushResult.java
rename to core/src/main/java/flex/messaging/client/PollFlushResult.java
diff --git a/core/src/flex/messaging/client/PollWaitListener.java b/core/src/main/java/flex/messaging/client/PollWaitListener.java
similarity index 100%
rename from core/src/flex/messaging/client/PollWaitListener.java
rename to core/src/main/java/flex/messaging/client/PollWaitListener.java
diff --git a/core/src/flex/messaging/client/UserAgentSettings.java b/core/src/main/java/flex/messaging/client/UserAgentSettings.java
similarity index 100%
rename from core/src/flex/messaging/client/UserAgentSettings.java
rename to core/src/main/java/flex/messaging/client/UserAgentSettings.java
diff --git a/core/src/flex/messaging/client/package-info.java b/core/src/main/java/flex/messaging/client/package-info.java
similarity index 100%
rename from core/src/flex/messaging/client/package-info.java
rename to core/src/main/java/flex/messaging/client/package-info.java
diff --git a/core/src/flex/messaging/cluster/BroadcastHandler.java b/core/src/main/java/flex/messaging/cluster/BroadcastHandler.java
similarity index 100%
rename from core/src/flex/messaging/cluster/BroadcastHandler.java
rename to core/src/main/java/flex/messaging/cluster/BroadcastHandler.java
diff --git a/core/src/flex/messaging/cluster/Cluster.java b/core/src/main/java/flex/messaging/cluster/Cluster.java
similarity index 100%
rename from core/src/flex/messaging/cluster/Cluster.java
rename to core/src/main/java/flex/messaging/cluster/Cluster.java
diff --git a/core/src/flex/messaging/cluster/ClusterException.java b/core/src/main/java/flex/messaging/cluster/ClusterException.java
similarity index 100%
rename from core/src/flex/messaging/cluster/ClusterException.java
rename to core/src/main/java/flex/messaging/cluster/ClusterException.java
diff --git a/core/src/flex/messaging/cluster/ClusterManager.java b/core/src/main/java/flex/messaging/cluster/ClusterManager.java
similarity index 100%
rename from core/src/flex/messaging/cluster/ClusterManager.java
rename to core/src/main/java/flex/messaging/cluster/ClusterManager.java
diff --git a/core/src/flex/messaging/cluster/ClusterMembershipListener.java b/core/src/main/java/flex/messaging/cluster/ClusterMembershipListener.java
similarity index 100%
rename from core/src/flex/messaging/cluster/ClusterMembershipListener.java
rename to core/src/main/java/flex/messaging/cluster/ClusterMembershipListener.java
diff --git a/core/src/flex/messaging/cluster/ClusterNode.java b/core/src/main/java/flex/messaging/cluster/ClusterNode.java
similarity index 100%
rename from core/src/flex/messaging/cluster/ClusterNode.java
rename to core/src/main/java/flex/messaging/cluster/ClusterNode.java
diff --git a/core/src/flex/messaging/cluster/RemoveNodeListener.java b/core/src/main/java/flex/messaging/cluster/RemoveNodeListener.java
similarity index 100%
rename from core/src/flex/messaging/cluster/RemoveNodeListener.java
rename to core/src/main/java/flex/messaging/cluster/RemoveNodeListener.java
diff --git a/core/src/flex/messaging/cluster/package-info.java b/core/src/main/java/flex/messaging/cluster/package-info.java
similarity index 100%
rename from core/src/flex/messaging/cluster/package-info.java
rename to core/src/main/java/flex/messaging/cluster/package-info.java
diff --git a/core/src/flex/messaging/config/ApacheXPathServerConfigurationParser.java b/core/src/main/java/flex/messaging/config/ApacheXPathServerConfigurationParser.java
similarity index 100%
rename from core/src/flex/messaging/config/ApacheXPathServerConfigurationParser.java
rename to core/src/main/java/flex/messaging/config/ApacheXPathServerConfigurationParser.java
diff --git a/core/src/flex/messaging/config/ClasspathResourceResolver.java b/core/src/main/java/flex/messaging/config/ClasspathResourceResolver.java
similarity index 100%
rename from core/src/flex/messaging/config/ClasspathResourceResolver.java
rename to core/src/main/java/flex/messaging/config/ClasspathResourceResolver.java
diff --git a/core/src/flex/messaging/config/ConfigurationManager.java b/core/src/main/java/flex/messaging/config/ConfigurationManager.java
similarity index 100%
rename from core/src/flex/messaging/config/ConfigurationManager.java
rename to core/src/main/java/flex/messaging/config/ConfigurationManager.java
diff --git a/core/src/flex/messaging/config/FactorySettings.java b/core/src/main/java/flex/messaging/config/FactorySettings.java
similarity index 100%
rename from core/src/flex/messaging/config/FactorySettings.java
rename to core/src/main/java/flex/messaging/config/FactorySettings.java
diff --git a/core/src/flex/messaging/config/FlexConfigurationManager.java b/core/src/main/java/flex/messaging/config/FlexConfigurationManager.java
similarity index 100%
rename from core/src/flex/messaging/config/FlexConfigurationManager.java
rename to core/src/main/java/flex/messaging/config/FlexConfigurationManager.java
diff --git a/core/src/flex/messaging/config/MessageFilterSettings.java b/core/src/main/java/flex/messaging/config/MessageFilterSettings.java
similarity index 100%
rename from core/src/flex/messaging/config/MessageFilterSettings.java
rename to core/src/main/java/flex/messaging/config/MessageFilterSettings.java
diff --git a/core/src/flex/messaging/config/MessagingConfiguration.java b/core/src/main/java/flex/messaging/config/MessagingConfiguration.java
similarity index 100%
rename from core/src/flex/messaging/config/MessagingConfiguration.java
rename to core/src/main/java/flex/messaging/config/MessagingConfiguration.java
diff --git a/core/src/flex/messaging/config/NetworkSettings.java b/core/src/main/java/flex/messaging/config/NetworkSettings.java
similarity index 100%
rename from core/src/flex/messaging/config/NetworkSettings.java
rename to core/src/main/java/flex/messaging/config/NetworkSettings.java
diff --git a/core/src/flex/messaging/config/SecuritySettings.java b/core/src/main/java/flex/messaging/config/SecuritySettings.java
similarity index 100%
rename from core/src/flex/messaging/config/SecuritySettings.java
rename to core/src/main/java/flex/messaging/config/SecuritySettings.java
diff --git a/core/src/flex/messaging/config/ServerConfigurationParser.java b/core/src/main/java/flex/messaging/config/ServerConfigurationParser.java
similarity index 100%
rename from core/src/flex/messaging/config/ServerConfigurationParser.java
rename to core/src/main/java/flex/messaging/config/ServerConfigurationParser.java
diff --git a/core/src/flex/messaging/config/ServerSettings.java b/core/src/main/java/flex/messaging/config/ServerSettings.java
similarity index 100%
rename from core/src/flex/messaging/config/ServerSettings.java
rename to core/src/main/java/flex/messaging/config/ServerSettings.java
diff --git a/core/src/flex/messaging/config/ServletResourceResolver.java b/core/src/main/java/flex/messaging/config/ServletResourceResolver.java
similarity index 100%
rename from core/src/flex/messaging/config/ServletResourceResolver.java
rename to core/src/main/java/flex/messaging/config/ServletResourceResolver.java
diff --git a/core/src/flex/messaging/config/SharedServerSettings.java b/core/src/main/java/flex/messaging/config/SharedServerSettings.java
similarity index 100%
rename from core/src/flex/messaging/config/SharedServerSettings.java
rename to core/src/main/java/flex/messaging/config/SharedServerSettings.java
diff --git a/core/src/flex/messaging/config/SystemSettings.java b/core/src/main/java/flex/messaging/config/SystemSettings.java
similarity index 100%
rename from core/src/flex/messaging/config/SystemSettings.java
rename to core/src/main/java/flex/messaging/config/SystemSettings.java
diff --git a/core/src/flex/messaging/config/ThrottleSettings.java b/core/src/main/java/flex/messaging/config/ThrottleSettings.java
similarity index 100%
rename from core/src/flex/messaging/config/ThrottleSettings.java
rename to core/src/main/java/flex/messaging/config/ThrottleSettings.java
diff --git a/core/src/flex/messaging/config/ValidatorSettings.java b/core/src/main/java/flex/messaging/config/ValidatorSettings.java
similarity index 100%
rename from core/src/flex/messaging/config/ValidatorSettings.java
rename to core/src/main/java/flex/messaging/config/ValidatorSettings.java
diff --git a/core/src/flex/messaging/config/XPathServerConfigurationParser.java b/core/src/main/java/flex/messaging/config/XPathServerConfigurationParser.java
similarity index 100%
rename from core/src/flex/messaging/config/XPathServerConfigurationParser.java
rename to core/src/main/java/flex/messaging/config/XPathServerConfigurationParser.java
diff --git a/core/src/flex/messaging/config/package-info.java b/core/src/main/java/flex/messaging/config/package-info.java
similarity index 100%
rename from core/src/flex/messaging/config/package-info.java
rename to core/src/main/java/flex/messaging/config/package-info.java
diff --git a/core/src/flex/messaging/endpoints/AMFEndpoint.java b/core/src/main/java/flex/messaging/endpoints/AMFEndpoint.java
similarity index 100%
rename from core/src/flex/messaging/endpoints/AMFEndpoint.java
rename to core/src/main/java/flex/messaging/endpoints/AMFEndpoint.java
diff --git a/core/src/flex/messaging/endpoints/AbstractEndpoint.java b/core/src/main/java/flex/messaging/endpoints/AbstractEndpoint.java
similarity index 100%
rename from core/src/flex/messaging/endpoints/AbstractEndpoint.java
rename to core/src/main/java/flex/messaging/endpoints/AbstractEndpoint.java
diff --git a/core/src/flex/messaging/endpoints/BaseHTTPEndpoint.java b/core/src/main/java/flex/messaging/endpoints/BaseHTTPEndpoint.java
similarity index 100%
rename from core/src/flex/messaging/endpoints/BaseHTTPEndpoint.java
rename to core/src/main/java/flex/messaging/endpoints/BaseHTTPEndpoint.java
diff --git a/core/src/flex/messaging/endpoints/BasePollingHTTPEndpoint.java b/core/src/main/java/flex/messaging/endpoints/BasePollingHTTPEndpoint.java
similarity index 100%
rename from core/src/flex/messaging/endpoints/BasePollingHTTPEndpoint.java
rename to core/src/main/java/flex/messaging/endpoints/BasePollingHTTPEndpoint.java
diff --git a/core/src/flex/messaging/endpoints/BaseStreamingHTTPEndpoint.java b/core/src/main/java/flex/messaging/endpoints/BaseStreamingHTTPEndpoint.java
similarity index 100%
rename from core/src/flex/messaging/endpoints/BaseStreamingHTTPEndpoint.java
rename to core/src/main/java/flex/messaging/endpoints/BaseStreamingHTTPEndpoint.java
diff --git a/core/src/flex/messaging/endpoints/DuplicateSessionException.java b/core/src/main/java/flex/messaging/endpoints/DuplicateSessionException.java
similarity index 100%
rename from core/src/flex/messaging/endpoints/DuplicateSessionException.java
rename to core/src/main/java/flex/messaging/endpoints/DuplicateSessionException.java
diff --git a/core/src/flex/messaging/endpoints/Endpoint.java b/core/src/main/java/flex/messaging/endpoints/Endpoint.java
similarity index 100%
rename from core/src/flex/messaging/endpoints/Endpoint.java
rename to core/src/main/java/flex/messaging/endpoints/Endpoint.java
diff --git a/core/src/flex/messaging/endpoints/Endpoint2.java b/core/src/main/java/flex/messaging/endpoints/Endpoint2.java
similarity index 100%
rename from core/src/flex/messaging/endpoints/Endpoint2.java
rename to core/src/main/java/flex/messaging/endpoints/Endpoint2.java
diff --git a/core/src/flex/messaging/endpoints/HTTPEndpoint.java b/core/src/main/java/flex/messaging/endpoints/HTTPEndpoint.java
similarity index 100%
rename from core/src/flex/messaging/endpoints/HTTPEndpoint.java
rename to core/src/main/java/flex/messaging/endpoints/HTTPEndpoint.java
diff --git a/core/src/flex/messaging/endpoints/SecureAMFEndpoint.java b/core/src/main/java/flex/messaging/endpoints/SecureAMFEndpoint.java
similarity index 100%
rename from core/src/flex/messaging/endpoints/SecureAMFEndpoint.java
rename to core/src/main/java/flex/messaging/endpoints/SecureAMFEndpoint.java
diff --git a/core/src/flex/messaging/endpoints/SecureHTTPEndpoint.java b/core/src/main/java/flex/messaging/endpoints/SecureHTTPEndpoint.java
similarity index 100%
rename from core/src/flex/messaging/endpoints/SecureHTTPEndpoint.java
rename to core/src/main/java/flex/messaging/endpoints/SecureHTTPEndpoint.java
diff --git a/core/src/flex/messaging/endpoints/SecureStreamingAMFEndpoint.java b/core/src/main/java/flex/messaging/endpoints/SecureStreamingAMFEndpoint.java
similarity index 100%
rename from core/src/flex/messaging/endpoints/SecureStreamingAMFEndpoint.java
rename to core/src/main/java/flex/messaging/endpoints/SecureStreamingAMFEndpoint.java
diff --git a/core/src/flex/messaging/endpoints/SecureStreamingHTTPEndpoint.java b/core/src/main/java/flex/messaging/endpoints/SecureStreamingHTTPEndpoint.java
similarity index 100%
rename from core/src/flex/messaging/endpoints/SecureStreamingHTTPEndpoint.java
rename to core/src/main/java/flex/messaging/endpoints/SecureStreamingHTTPEndpoint.java
diff --git a/core/src/flex/messaging/endpoints/StreamingAMFEndpoint.java b/core/src/main/java/flex/messaging/endpoints/StreamingAMFEndpoint.java
similarity index 100%
rename from core/src/flex/messaging/endpoints/StreamingAMFEndpoint.java
rename to core/src/main/java/flex/messaging/endpoints/StreamingAMFEndpoint.java
diff --git a/core/src/flex/messaging/endpoints/StreamingHTTPEndpoint.java b/core/src/main/java/flex/messaging/endpoints/StreamingHTTPEndpoint.java
similarity index 100%
rename from core/src/flex/messaging/endpoints/StreamingHTTPEndpoint.java
rename to core/src/main/java/flex/messaging/endpoints/StreamingHTTPEndpoint.java
diff --git a/core/src/flex/messaging/endpoints/amf/AMFFilter.java b/core/src/main/java/flex/messaging/endpoints/amf/AMFFilter.java
similarity index 100%
rename from core/src/flex/messaging/endpoints/amf/AMFFilter.java
rename to core/src/main/java/flex/messaging/endpoints/amf/AMFFilter.java
diff --git a/core/src/flex/messaging/endpoints/amf/BatchProcessFilter.java b/core/src/main/java/flex/messaging/endpoints/amf/BatchProcessFilter.java
similarity index 100%
rename from core/src/flex/messaging/endpoints/amf/BatchProcessFilter.java
rename to core/src/main/java/flex/messaging/endpoints/amf/BatchProcessFilter.java
diff --git a/core/src/flex/messaging/endpoints/amf/LegacyFilter.java b/core/src/main/java/flex/messaging/endpoints/amf/LegacyFilter.java
similarity index 100%
rename from core/src/flex/messaging/endpoints/amf/LegacyFilter.java
rename to core/src/main/java/flex/messaging/endpoints/amf/LegacyFilter.java
diff --git a/core/src/flex/messaging/endpoints/amf/MessageBrokerFilter.java b/core/src/main/java/flex/messaging/endpoints/amf/MessageBrokerFilter.java
similarity index 100%
rename from core/src/flex/messaging/endpoints/amf/MessageBrokerFilter.java
rename to core/src/main/java/flex/messaging/endpoints/amf/MessageBrokerFilter.java
diff --git a/core/src/flex/messaging/endpoints/amf/SerializationFilter.java b/core/src/main/java/flex/messaging/endpoints/amf/SerializationFilter.java
similarity index 100%
rename from core/src/flex/messaging/endpoints/amf/SerializationFilter.java
rename to core/src/main/java/flex/messaging/endpoints/amf/SerializationFilter.java
diff --git a/core/src/flex/messaging/endpoints/amf/SessionFilter.java b/core/src/main/java/flex/messaging/endpoints/amf/SessionFilter.java
similarity index 100%
rename from core/src/flex/messaging/endpoints/amf/SessionFilter.java
rename to core/src/main/java/flex/messaging/endpoints/amf/SessionFilter.java
diff --git a/core/src/flex/messaging/endpoints/amf/package-info.java b/core/src/main/java/flex/messaging/endpoints/amf/package-info.java
similarity index 100%
rename from core/src/flex/messaging/endpoints/amf/package-info.java
rename to core/src/main/java/flex/messaging/endpoints/amf/package-info.java
diff --git a/core/src/flex/messaging/endpoints/package-info.java b/core/src/main/java/flex/messaging/endpoints/package-info.java
similarity index 100%
rename from core/src/flex/messaging/endpoints/package-info.java
rename to core/src/main/java/flex/messaging/endpoints/package-info.java
diff --git a/core/src/flex/messaging/factories/JavaFactory.java b/core/src/main/java/flex/messaging/factories/JavaFactory.java
similarity index 100%
rename from core/src/flex/messaging/factories/JavaFactory.java
rename to core/src/main/java/flex/messaging/factories/JavaFactory.java
diff --git a/core/src/flex/messaging/factories/JavaFactoryInstance.java b/core/src/main/java/flex/messaging/factories/JavaFactoryInstance.java
similarity index 100%
rename from core/src/flex/messaging/factories/JavaFactoryInstance.java
rename to core/src/main/java/flex/messaging/factories/JavaFactoryInstance.java
diff --git a/core/src/flex/messaging/factories/package-info.java b/core/src/main/java/flex/messaging/factories/package-info.java
similarity index 100%
rename from core/src/flex/messaging/factories/package-info.java
rename to core/src/main/java/flex/messaging/factories/package-info.java
diff --git a/core/src/flex/messaging/io/AbstractProxy.java b/core/src/main/java/flex/messaging/io/AbstractProxy.java
similarity index 100%
rename from core/src/flex/messaging/io/AbstractProxy.java
rename to core/src/main/java/flex/messaging/io/AbstractProxy.java
diff --git a/core/src/flex/messaging/io/ArrayCollection.java b/core/src/main/java/flex/messaging/io/ArrayCollection.java
similarity index 100%
rename from core/src/flex/messaging/io/ArrayCollection.java
rename to core/src/main/java/flex/messaging/io/ArrayCollection.java
diff --git a/core/src/flex/messaging/io/ArrayList.java b/core/src/main/java/flex/messaging/io/ArrayList.java
similarity index 100%
rename from core/src/flex/messaging/io/ArrayList.java
rename to core/src/main/java/flex/messaging/io/ArrayList.java
diff --git a/core/src/flex/messaging/io/BeanProxy.java b/core/src/main/java/flex/messaging/io/BeanProxy.java
similarity index 100%
rename from core/src/flex/messaging/io/BeanProxy.java
rename to core/src/main/java/flex/messaging/io/BeanProxy.java
diff --git a/core/src/flex/messaging/io/ClassAlias.java b/core/src/main/java/flex/messaging/io/ClassAlias.java
similarity index 100%
rename from core/src/flex/messaging/io/ClassAlias.java
rename to core/src/main/java/flex/messaging/io/ClassAlias.java
diff --git a/core/src/flex/messaging/io/ClassAliasRegistry.java b/core/src/main/java/flex/messaging/io/ClassAliasRegistry.java
similarity index 100%
rename from core/src/flex/messaging/io/ClassAliasRegistry.java
rename to core/src/main/java/flex/messaging/io/ClassAliasRegistry.java
diff --git a/core/src/flex/messaging/io/DictionaryProxy.java b/core/src/main/java/flex/messaging/io/DictionaryProxy.java
similarity index 100%
rename from core/src/flex/messaging/io/DictionaryProxy.java
rename to core/src/main/java/flex/messaging/io/DictionaryProxy.java
diff --git a/core/src/flex/messaging/io/ManagedObjectProxy.java b/core/src/main/java/flex/messaging/io/ManagedObjectProxy.java
similarity index 100%
rename from core/src/flex/messaging/io/ManagedObjectProxy.java
rename to core/src/main/java/flex/messaging/io/ManagedObjectProxy.java
diff --git a/core/src/flex/messaging/io/MapProxy.java b/core/src/main/java/flex/messaging/io/MapProxy.java
similarity index 100%
rename from core/src/flex/messaging/io/MapProxy.java
rename to core/src/main/java/flex/messaging/io/MapProxy.java
diff --git a/core/src/flex/messaging/io/MessageDeserializer.java b/core/src/main/java/flex/messaging/io/MessageDeserializer.java
similarity index 100%
rename from core/src/flex/messaging/io/MessageDeserializer.java
rename to core/src/main/java/flex/messaging/io/MessageDeserializer.java
diff --git a/core/src/flex/messaging/io/MessageIOConstants.java b/core/src/main/java/flex/messaging/io/MessageIOConstants.java
similarity index 100%
rename from core/src/flex/messaging/io/MessageIOConstants.java
rename to core/src/main/java/flex/messaging/io/MessageIOConstants.java
diff --git a/core/src/flex/messaging/io/MessageSerializer.java b/core/src/main/java/flex/messaging/io/MessageSerializer.java
similarity index 100%
rename from core/src/flex/messaging/io/MessageSerializer.java
rename to core/src/main/java/flex/messaging/io/MessageSerializer.java
diff --git a/core/src/flex/messaging/io/ObjectProxy.java b/core/src/main/java/flex/messaging/io/ObjectProxy.java
similarity index 100%
rename from core/src/flex/messaging/io/ObjectProxy.java
rename to core/src/main/java/flex/messaging/io/ObjectProxy.java
diff --git a/core/src/flex/messaging/io/PageableRowSet.java b/core/src/main/java/flex/messaging/io/PageableRowSet.java
similarity index 100%
rename from core/src/flex/messaging/io/PageableRowSet.java
rename to core/src/main/java/flex/messaging/io/PageableRowSet.java
diff --git a/core/src/flex/messaging/io/PageableRowSetProxy.java b/core/src/main/java/flex/messaging/io/PageableRowSetProxy.java
similarity index 100%
rename from core/src/flex/messaging/io/PageableRowSetProxy.java
rename to core/src/main/java/flex/messaging/io/PageableRowSetProxy.java
diff --git a/core/src/flex/messaging/io/PagedRowSet.java b/core/src/main/java/flex/messaging/io/PagedRowSet.java
similarity index 100%
rename from core/src/flex/messaging/io/PagedRowSet.java
rename to core/src/main/java/flex/messaging/io/PagedRowSet.java
diff --git a/core/src/flex/messaging/io/PropertyProxy.java b/core/src/main/java/flex/messaging/io/PropertyProxy.java
similarity index 100%
rename from core/src/flex/messaging/io/PropertyProxy.java
rename to core/src/main/java/flex/messaging/io/PropertyProxy.java
diff --git a/core/src/flex/messaging/io/PropertyProxyRegistry.java b/core/src/main/java/flex/messaging/io/PropertyProxyRegistry.java
similarity index 100%
rename from core/src/flex/messaging/io/PropertyProxyRegistry.java
rename to core/src/main/java/flex/messaging/io/PropertyProxyRegistry.java
diff --git a/core/src/flex/messaging/io/RecoverableSerializationException.java b/core/src/main/java/flex/messaging/io/RecoverableSerializationException.java
similarity index 100%
rename from core/src/flex/messaging/io/RecoverableSerializationException.java
rename to core/src/main/java/flex/messaging/io/RecoverableSerializationException.java
diff --git a/core/src/flex/messaging/io/SerializationContext.java b/core/src/main/java/flex/messaging/io/SerializationContext.java
similarity index 100%
rename from core/src/flex/messaging/io/SerializationContext.java
rename to core/src/main/java/flex/messaging/io/SerializationContext.java
diff --git a/core/src/flex/messaging/io/SerializationDescriptor.java b/core/src/main/java/flex/messaging/io/SerializationDescriptor.java
similarity index 100%
rename from core/src/flex/messaging/io/SerializationDescriptor.java
rename to core/src/main/java/flex/messaging/io/SerializationDescriptor.java
diff --git a/core/src/flex/messaging/io/SerializationException.java b/core/src/main/java/flex/messaging/io/SerializationException.java
similarity index 100%
rename from core/src/flex/messaging/io/SerializationException.java
rename to core/src/main/java/flex/messaging/io/SerializationException.java
diff --git a/core/src/flex/messaging/io/SerializationProxy.java b/core/src/main/java/flex/messaging/io/SerializationProxy.java
similarity index 100%
rename from core/src/flex/messaging/io/SerializationProxy.java
rename to core/src/main/java/flex/messaging/io/SerializationProxy.java
diff --git a/core/src/flex/messaging/io/StatusInfoProxy.java b/core/src/main/java/flex/messaging/io/StatusInfoProxy.java
similarity index 100%
rename from core/src/flex/messaging/io/StatusInfoProxy.java
rename to core/src/main/java/flex/messaging/io/StatusInfoProxy.java
diff --git a/core/src/flex/messaging/io/ThrowableProxy.java b/core/src/main/java/flex/messaging/io/ThrowableProxy.java
similarity index 100%
rename from core/src/flex/messaging/io/ThrowableProxy.java
rename to core/src/main/java/flex/messaging/io/ThrowableProxy.java
diff --git a/core/src/flex/messaging/io/TypeMarshaller.java b/core/src/main/java/flex/messaging/io/TypeMarshaller.java
similarity index 100%
rename from core/src/flex/messaging/io/TypeMarshaller.java
rename to core/src/main/java/flex/messaging/io/TypeMarshaller.java
diff --git a/core/src/flex/messaging/io/TypeMarshallingContext.java b/core/src/main/java/flex/messaging/io/TypeMarshallingContext.java
similarity index 100%
rename from core/src/flex/messaging/io/TypeMarshallingContext.java
rename to core/src/main/java/flex/messaging/io/TypeMarshallingContext.java
diff --git a/core/src/flex/messaging/io/UnknownTypeException.java b/core/src/main/java/flex/messaging/io/UnknownTypeException.java
similarity index 100%
rename from core/src/flex/messaging/io/UnknownTypeException.java
rename to core/src/main/java/flex/messaging/io/UnknownTypeException.java
diff --git a/core/src/flex/messaging/io/amf/ASObject.java b/core/src/main/java/flex/messaging/io/amf/ASObject.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/ASObject.java
rename to core/src/main/java/flex/messaging/io/amf/ASObject.java
diff --git a/core/src/flex/messaging/io/amf/AbstractAmfInput.java b/core/src/main/java/flex/messaging/io/amf/AbstractAmfInput.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/AbstractAmfInput.java
rename to core/src/main/java/flex/messaging/io/amf/AbstractAmfInput.java
diff --git a/core/src/flex/messaging/io/amf/AbstractAmfOutput.java b/core/src/main/java/flex/messaging/io/amf/AbstractAmfOutput.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/AbstractAmfOutput.java
rename to core/src/main/java/flex/messaging/io/amf/AbstractAmfOutput.java
diff --git a/core/src/flex/messaging/io/amf/ActionContext.java b/core/src/main/java/flex/messaging/io/amf/ActionContext.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/ActionContext.java
rename to core/src/main/java/flex/messaging/io/amf/ActionContext.java
diff --git a/core/src/flex/messaging/io/amf/ActionMessage.java b/core/src/main/java/flex/messaging/io/amf/ActionMessage.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/ActionMessage.java
rename to core/src/main/java/flex/messaging/io/amf/ActionMessage.java
diff --git a/core/src/flex/messaging/io/amf/ActionMessageInput.java b/core/src/main/java/flex/messaging/io/amf/ActionMessageInput.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/ActionMessageInput.java
rename to core/src/main/java/flex/messaging/io/amf/ActionMessageInput.java
diff --git a/core/src/flex/messaging/io/amf/ActionMessageOutput.java b/core/src/main/java/flex/messaging/io/amf/ActionMessageOutput.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/ActionMessageOutput.java
rename to core/src/main/java/flex/messaging/io/amf/ActionMessageOutput.java
diff --git a/core/src/flex/messaging/io/amf/Amf0Input.java b/core/src/main/java/flex/messaging/io/amf/Amf0Input.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/Amf0Input.java
rename to core/src/main/java/flex/messaging/io/amf/Amf0Input.java
diff --git a/core/src/flex/messaging/io/amf/Amf0Output.java b/core/src/main/java/flex/messaging/io/amf/Amf0Output.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/Amf0Output.java
rename to core/src/main/java/flex/messaging/io/amf/Amf0Output.java
diff --git a/core/src/flex/messaging/io/amf/Amf3Input.java b/core/src/main/java/flex/messaging/io/amf/Amf3Input.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/Amf3Input.java
rename to core/src/main/java/flex/messaging/io/amf/Amf3Input.java
diff --git a/core/src/flex/messaging/io/amf/Amf3Output.java b/core/src/main/java/flex/messaging/io/amf/Amf3Output.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/Amf3Output.java
rename to core/src/main/java/flex/messaging/io/amf/Amf3Output.java
diff --git a/core/src/flex/messaging/io/amf/Amf3Types.java b/core/src/main/java/flex/messaging/io/amf/Amf3Types.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/Amf3Types.java
rename to core/src/main/java/flex/messaging/io/amf/Amf3Types.java
diff --git a/core/src/flex/messaging/io/amf/AmfIO.java b/core/src/main/java/flex/messaging/io/amf/AmfIO.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/AmfIO.java
rename to core/src/main/java/flex/messaging/io/amf/AmfIO.java
diff --git a/core/src/flex/messaging/io/amf/AmfMessageDeserializer.java b/core/src/main/java/flex/messaging/io/amf/AmfMessageDeserializer.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/AmfMessageDeserializer.java
rename to core/src/main/java/flex/messaging/io/amf/AmfMessageDeserializer.java
diff --git a/core/src/flex/messaging/io/amf/AmfMessageSerializer.java b/core/src/main/java/flex/messaging/io/amf/AmfMessageSerializer.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/AmfMessageSerializer.java
rename to core/src/main/java/flex/messaging/io/amf/AmfMessageSerializer.java
diff --git a/core/src/flex/messaging/io/amf/AmfTrace.java b/core/src/main/java/flex/messaging/io/amf/AmfTrace.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/AmfTrace.java
rename to core/src/main/java/flex/messaging/io/amf/AmfTrace.java
diff --git a/core/src/flex/messaging/io/amf/AmfTypes.java b/core/src/main/java/flex/messaging/io/amf/AmfTypes.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/AmfTypes.java
rename to core/src/main/java/flex/messaging/io/amf/AmfTypes.java
diff --git a/core/src/flex/messaging/io/amf/MessageBody.java b/core/src/main/java/flex/messaging/io/amf/MessageBody.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/MessageBody.java
rename to core/src/main/java/flex/messaging/io/amf/MessageBody.java
diff --git a/core/src/flex/messaging/io/amf/MessageHeader.java b/core/src/main/java/flex/messaging/io/amf/MessageHeader.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/MessageHeader.java
rename to core/src/main/java/flex/messaging/io/amf/MessageHeader.java
diff --git a/core/src/flex/messaging/io/amf/SerializedObject.java b/core/src/main/java/flex/messaging/io/amf/SerializedObject.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/SerializedObject.java
rename to core/src/main/java/flex/messaging/io/amf/SerializedObject.java
diff --git a/core/src/flex/messaging/io/amf/TraitsInfo.java b/core/src/main/java/flex/messaging/io/amf/TraitsInfo.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/TraitsInfo.java
rename to core/src/main/java/flex/messaging/io/amf/TraitsInfo.java
diff --git a/core/src/flex/messaging/io/amf/client/AMFConnection.java b/core/src/main/java/flex/messaging/io/amf/client/AMFConnection.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/client/AMFConnection.java
rename to core/src/main/java/flex/messaging/io/amf/client/AMFConnection.java
diff --git a/core/src/flex/messaging/io/amf/client/AMFHeaderProcessor.java b/core/src/main/java/flex/messaging/io/amf/client/AMFHeaderProcessor.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/client/AMFHeaderProcessor.java
rename to core/src/main/java/flex/messaging/io/amf/client/AMFHeaderProcessor.java
diff --git a/core/src/flex/messaging/io/amf/client/exceptions/ClientStatusException.java b/core/src/main/java/flex/messaging/io/amf/client/exceptions/ClientStatusException.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/client/exceptions/ClientStatusException.java
rename to core/src/main/java/flex/messaging/io/amf/client/exceptions/ClientStatusException.java
diff --git a/core/src/flex/messaging/io/amf/client/exceptions/ServerStatusException.java b/core/src/main/java/flex/messaging/io/amf/client/exceptions/ServerStatusException.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/client/exceptions/ServerStatusException.java
rename to core/src/main/java/flex/messaging/io/amf/client/exceptions/ServerStatusException.java
diff --git a/core/src/flex/messaging/io/amf/client/exceptions/package-info.java b/core/src/main/java/flex/messaging/io/amf/client/exceptions/package-info.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/client/exceptions/package-info.java
rename to core/src/main/java/flex/messaging/io/amf/client/exceptions/package-info.java
diff --git a/core/src/flex/messaging/io/amf/client/package-info.java b/core/src/main/java/flex/messaging/io/amf/client/package-info.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/client/package-info.java
rename to core/src/main/java/flex/messaging/io/amf/client/package-info.java
diff --git a/core/src/flex/messaging/io/amf/package-info.java b/core/src/main/java/flex/messaging/io/amf/package-info.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/package-info.java
rename to core/src/main/java/flex/messaging/io/amf/package-info.java
diff --git a/core/src/flex/messaging/io/amf/translator/ASTranslator.java b/core/src/main/java/flex/messaging/io/amf/translator/ASTranslator.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/translator/ASTranslator.java
rename to core/src/main/java/flex/messaging/io/amf/translator/ASTranslator.java
diff --git a/core/src/flex/messaging/io/amf/translator/TranslationException.java b/core/src/main/java/flex/messaging/io/amf/translator/TranslationException.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/translator/TranslationException.java
rename to core/src/main/java/flex/messaging/io/amf/translator/TranslationException.java
diff --git a/core/src/flex/messaging/io/amf/translator/decoder/ActionScriptDecoder.java b/core/src/main/java/flex/messaging/io/amf/translator/decoder/ActionScriptDecoder.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/translator/decoder/ActionScriptDecoder.java
rename to core/src/main/java/flex/messaging/io/amf/translator/decoder/ActionScriptDecoder.java
diff --git a/core/src/flex/messaging/io/amf/translator/decoder/ArrayDecoder.java b/core/src/main/java/flex/messaging/io/amf/translator/decoder/ArrayDecoder.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/translator/decoder/ArrayDecoder.java
rename to core/src/main/java/flex/messaging/io/amf/translator/decoder/ArrayDecoder.java
diff --git a/core/src/flex/messaging/io/amf/translator/decoder/BooleanDecoder.java b/core/src/main/java/flex/messaging/io/amf/translator/decoder/BooleanDecoder.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/translator/decoder/BooleanDecoder.java
rename to core/src/main/java/flex/messaging/io/amf/translator/decoder/BooleanDecoder.java
diff --git a/core/src/flex/messaging/io/amf/translator/decoder/CalendarDecoder.java b/core/src/main/java/flex/messaging/io/amf/translator/decoder/CalendarDecoder.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/translator/decoder/CalendarDecoder.java
rename to core/src/main/java/flex/messaging/io/amf/translator/decoder/CalendarDecoder.java
diff --git a/core/src/flex/messaging/io/amf/translator/decoder/CharacterDecoder.java b/core/src/main/java/flex/messaging/io/amf/translator/decoder/CharacterDecoder.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/translator/decoder/CharacterDecoder.java
rename to core/src/main/java/flex/messaging/io/amf/translator/decoder/CharacterDecoder.java
diff --git a/core/src/flex/messaging/io/amf/translator/decoder/CollectionDecoder.java b/core/src/main/java/flex/messaging/io/amf/translator/decoder/CollectionDecoder.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/translator/decoder/CollectionDecoder.java
rename to core/src/main/java/flex/messaging/io/amf/translator/decoder/CollectionDecoder.java
diff --git a/core/src/flex/messaging/io/amf/translator/decoder/DateDecoder.java b/core/src/main/java/flex/messaging/io/amf/translator/decoder/DateDecoder.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/translator/decoder/DateDecoder.java
rename to core/src/main/java/flex/messaging/io/amf/translator/decoder/DateDecoder.java
diff --git a/core/src/flex/messaging/io/amf/translator/decoder/DecoderFactory.java b/core/src/main/java/flex/messaging/io/amf/translator/decoder/DecoderFactory.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/translator/decoder/DecoderFactory.java
rename to core/src/main/java/flex/messaging/io/amf/translator/decoder/DecoderFactory.java
diff --git a/core/src/flex/messaging/io/amf/translator/decoder/EnumDecoder.java b/core/src/main/java/flex/messaging/io/amf/translator/decoder/EnumDecoder.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/translator/decoder/EnumDecoder.java
rename to core/src/main/java/flex/messaging/io/amf/translator/decoder/EnumDecoder.java
diff --git a/core/src/flex/messaging/io/amf/translator/decoder/MapDecoder.java b/core/src/main/java/flex/messaging/io/amf/translator/decoder/MapDecoder.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/translator/decoder/MapDecoder.java
rename to core/src/main/java/flex/messaging/io/amf/translator/decoder/MapDecoder.java
diff --git a/core/src/flex/messaging/io/amf/translator/decoder/NativeDecoder.java b/core/src/main/java/flex/messaging/io/amf/translator/decoder/NativeDecoder.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/translator/decoder/NativeDecoder.java
rename to core/src/main/java/flex/messaging/io/amf/translator/decoder/NativeDecoder.java
diff --git a/core/src/flex/messaging/io/amf/translator/decoder/NullDecoder.java b/core/src/main/java/flex/messaging/io/amf/translator/decoder/NullDecoder.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/translator/decoder/NullDecoder.java
rename to core/src/main/java/flex/messaging/io/amf/translator/decoder/NullDecoder.java
diff --git a/core/src/flex/messaging/io/amf/translator/decoder/NumberDecoder.java b/core/src/main/java/flex/messaging/io/amf/translator/decoder/NumberDecoder.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/translator/decoder/NumberDecoder.java
rename to core/src/main/java/flex/messaging/io/amf/translator/decoder/NumberDecoder.java
diff --git a/core/src/flex/messaging/io/amf/translator/decoder/ReferenceAwareArrayDecoder.java b/core/src/main/java/flex/messaging/io/amf/translator/decoder/ReferenceAwareArrayDecoder.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/translator/decoder/ReferenceAwareArrayDecoder.java
rename to core/src/main/java/flex/messaging/io/amf/translator/decoder/ReferenceAwareArrayDecoder.java
diff --git a/core/src/flex/messaging/io/amf/translator/decoder/ReferenceAwareCalendarDecoder.java b/core/src/main/java/flex/messaging/io/amf/translator/decoder/ReferenceAwareCalendarDecoder.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/translator/decoder/ReferenceAwareCalendarDecoder.java
rename to core/src/main/java/flex/messaging/io/amf/translator/decoder/ReferenceAwareCalendarDecoder.java
diff --git a/core/src/flex/messaging/io/amf/translator/decoder/ReferenceAwareCollectionDecoder.java b/core/src/main/java/flex/messaging/io/amf/translator/decoder/ReferenceAwareCollectionDecoder.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/translator/decoder/ReferenceAwareCollectionDecoder.java
rename to core/src/main/java/flex/messaging/io/amf/translator/decoder/ReferenceAwareCollectionDecoder.java
diff --git a/core/src/flex/messaging/io/amf/translator/decoder/ReferenceAwareDateDecoder.java b/core/src/main/java/flex/messaging/io/amf/translator/decoder/ReferenceAwareDateDecoder.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/translator/decoder/ReferenceAwareDateDecoder.java
rename to core/src/main/java/flex/messaging/io/amf/translator/decoder/ReferenceAwareDateDecoder.java
diff --git a/core/src/flex/messaging/io/amf/translator/decoder/ReferenceAwareMapDecoder.java b/core/src/main/java/flex/messaging/io/amf/translator/decoder/ReferenceAwareMapDecoder.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/translator/decoder/ReferenceAwareMapDecoder.java
rename to core/src/main/java/flex/messaging/io/amf/translator/decoder/ReferenceAwareMapDecoder.java
diff --git a/core/src/flex/messaging/io/amf/translator/decoder/ReferenceAwareTypedObjectDecoder.java b/core/src/main/java/flex/messaging/io/amf/translator/decoder/ReferenceAwareTypedObjectDecoder.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/translator/decoder/ReferenceAwareTypedObjectDecoder.java
rename to core/src/main/java/flex/messaging/io/amf/translator/decoder/ReferenceAwareTypedObjectDecoder.java
diff --git a/core/src/flex/messaging/io/amf/translator/decoder/StringDecoder.java b/core/src/main/java/flex/messaging/io/amf/translator/decoder/StringDecoder.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/translator/decoder/StringDecoder.java
rename to core/src/main/java/flex/messaging/io/amf/translator/decoder/StringDecoder.java
diff --git a/core/src/flex/messaging/io/amf/translator/decoder/TypedObjectDecoder.java b/core/src/main/java/flex/messaging/io/amf/translator/decoder/TypedObjectDecoder.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/translator/decoder/TypedObjectDecoder.java
rename to core/src/main/java/flex/messaging/io/amf/translator/decoder/TypedObjectDecoder.java
diff --git a/core/src/flex/messaging/io/amf/translator/decoder/package-info.java b/core/src/main/java/flex/messaging/io/amf/translator/decoder/package-info.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/translator/decoder/package-info.java
rename to core/src/main/java/flex/messaging/io/amf/translator/decoder/package-info.java
diff --git a/core/src/flex/messaging/io/amf/translator/package-info.java b/core/src/main/java/flex/messaging/io/amf/translator/package-info.java
similarity index 100%
rename from core/src/flex/messaging/io/amf/translator/package-info.java
rename to core/src/main/java/flex/messaging/io/amf/translator/package-info.java
diff --git a/core/src/flex/messaging/io/amfx/AmfxInput.java b/core/src/main/java/flex/messaging/io/amfx/AmfxInput.java
similarity index 100%
rename from core/src/flex/messaging/io/amfx/AmfxInput.java
rename to core/src/main/java/flex/messaging/io/amfx/AmfxInput.java
diff --git a/core/src/flex/messaging/io/amfx/AmfxMessageDeserializer.java b/core/src/main/java/flex/messaging/io/amfx/AmfxMessageDeserializer.java
similarity index 100%
rename from core/src/flex/messaging/io/amfx/AmfxMessageDeserializer.java
rename to core/src/main/java/flex/messaging/io/amfx/AmfxMessageDeserializer.java
diff --git a/core/src/flex/messaging/io/amfx/AmfxMessageSerializer.java b/core/src/main/java/flex/messaging/io/amfx/AmfxMessageSerializer.java
similarity index 100%
rename from core/src/flex/messaging/io/amfx/AmfxMessageSerializer.java
rename to core/src/main/java/flex/messaging/io/amfx/AmfxMessageSerializer.java
diff --git a/core/src/flex/messaging/io/amfx/AmfxOutput.java b/core/src/main/java/flex/messaging/io/amfx/AmfxOutput.java
similarity index 100%
rename from core/src/flex/messaging/io/amfx/AmfxOutput.java
rename to core/src/main/java/flex/messaging/io/amfx/AmfxOutput.java
diff --git a/core/src/flex/messaging/io/amfx/AmfxTypes.java b/core/src/main/java/flex/messaging/io/amfx/AmfxTypes.java
similarity index 100%
rename from core/src/flex/messaging/io/amfx/AmfxTypes.java
rename to core/src/main/java/flex/messaging/io/amfx/AmfxTypes.java
diff --git a/core/src/flex/messaging/io/amfx/package-info.java b/core/src/main/java/flex/messaging/io/amfx/package-info.java
similarity index 100%
rename from core/src/flex/messaging/io/amfx/package-info.java
rename to core/src/main/java/flex/messaging/io/amfx/package-info.java
diff --git a/core/src/flex/messaging/io/package-info.java b/core/src/main/java/flex/messaging/io/package-info.java
similarity index 100%
rename from core/src/flex/messaging/io/package-info.java
rename to core/src/main/java/flex/messaging/io/package-info.java
diff --git a/core/src/flex/messaging/log/HTTPRequestLog.java b/core/src/main/java/flex/messaging/log/HTTPRequestLog.java
similarity index 100%
rename from core/src/flex/messaging/log/HTTPRequestLog.java
rename to core/src/main/java/flex/messaging/log/HTTPRequestLog.java
diff --git a/core/src/flex/messaging/log/LoggingHttpServletRequestWrapper.java b/core/src/main/java/flex/messaging/log/LoggingHttpServletRequestWrapper.java
similarity index 100%
rename from core/src/flex/messaging/log/LoggingHttpServletRequestWrapper.java
rename to core/src/main/java/flex/messaging/log/LoggingHttpServletRequestWrapper.java
diff --git a/core/src/flex/messaging/log/ServletLogTarget.java b/core/src/main/java/flex/messaging/log/ServletLogTarget.java
similarity index 100%
rename from core/src/flex/messaging/log/ServletLogTarget.java
rename to core/src/main/java/flex/messaging/log/ServletLogTarget.java
diff --git a/core/src/flex/messaging/log/package-info.java b/core/src/main/java/flex/messaging/log/package-info.java
similarity index 100%
rename from core/src/flex/messaging/log/package-info.java
rename to core/src/main/java/flex/messaging/log/package-info.java
diff --git a/core/src/flex/messaging/messages/AbstractMessage.java b/core/src/main/java/flex/messaging/messages/AbstractMessage.java
similarity index 100%
rename from core/src/flex/messaging/messages/AbstractMessage.java
rename to core/src/main/java/flex/messaging/messages/AbstractMessage.java
diff --git a/core/src/flex/messaging/messages/AcknowledgeMessage.java b/core/src/main/java/flex/messaging/messages/AcknowledgeMessage.java
similarity index 100%
rename from core/src/flex/messaging/messages/AcknowledgeMessage.java
rename to core/src/main/java/flex/messaging/messages/AcknowledgeMessage.java
diff --git a/core/src/flex/messaging/messages/AcknowledgeMessageExt.java b/core/src/main/java/flex/messaging/messages/AcknowledgeMessageExt.java
similarity index 100%
rename from core/src/flex/messaging/messages/AcknowledgeMessageExt.java
rename to core/src/main/java/flex/messaging/messages/AcknowledgeMessageExt.java
diff --git a/core/src/flex/messaging/messages/AsyncMessage.java b/core/src/main/java/flex/messaging/messages/AsyncMessage.java
similarity index 100%
rename from core/src/flex/messaging/messages/AsyncMessage.java
rename to core/src/main/java/flex/messaging/messages/AsyncMessage.java
diff --git a/core/src/flex/messaging/messages/AsyncMessageExt.java b/core/src/main/java/flex/messaging/messages/AsyncMessageExt.java
similarity index 100%
rename from core/src/flex/messaging/messages/AsyncMessageExt.java
rename to core/src/main/java/flex/messaging/messages/AsyncMessageExt.java
diff --git a/core/src/flex/messaging/messages/BatchableMessage.java b/core/src/main/java/flex/messaging/messages/BatchableMessage.java
similarity index 100%
rename from core/src/flex/messaging/messages/BatchableMessage.java
rename to core/src/main/java/flex/messaging/messages/BatchableMessage.java
diff --git a/core/src/flex/messaging/messages/CommandMessage.java b/core/src/main/java/flex/messaging/messages/CommandMessage.java
similarity index 100%
rename from core/src/flex/messaging/messages/CommandMessage.java
rename to core/src/main/java/flex/messaging/messages/CommandMessage.java
diff --git a/core/src/flex/messaging/messages/CommandMessageExt.java b/core/src/main/java/flex/messaging/messages/CommandMessageExt.java
similarity index 100%
rename from core/src/flex/messaging/messages/CommandMessageExt.java
rename to core/src/main/java/flex/messaging/messages/CommandMessageExt.java
diff --git a/core/src/flex/messaging/messages/ErrorMessage.java b/core/src/main/java/flex/messaging/messages/ErrorMessage.java
similarity index 100%
rename from core/src/flex/messaging/messages/ErrorMessage.java
rename to core/src/main/java/flex/messaging/messages/ErrorMessage.java
diff --git a/core/src/flex/messaging/messages/HTTPMessage.java b/core/src/main/java/flex/messaging/messages/HTTPMessage.java
similarity index 100%
rename from core/src/flex/messaging/messages/HTTPMessage.java
rename to core/src/main/java/flex/messaging/messages/HTTPMessage.java
diff --git a/core/src/flex/messaging/messages/Message.java b/core/src/main/java/flex/messaging/messages/Message.java
similarity index 100%
rename from core/src/flex/messaging/messages/Message.java
rename to core/src/main/java/flex/messaging/messages/Message.java
diff --git a/core/src/flex/messaging/messages/MessagePerformanceInfo.java b/core/src/main/java/flex/messaging/messages/MessagePerformanceInfo.java
similarity index 100%
rename from core/src/flex/messaging/messages/MessagePerformanceInfo.java
rename to core/src/main/java/flex/messaging/messages/MessagePerformanceInfo.java
diff --git a/core/src/flex/messaging/messages/MessagePerformanceUtils.java b/core/src/main/java/flex/messaging/messages/MessagePerformanceUtils.java
similarity index 100%
rename from core/src/flex/messaging/messages/MessagePerformanceUtils.java
rename to core/src/main/java/flex/messaging/messages/MessagePerformanceUtils.java
diff --git a/core/src/flex/messaging/messages/RPCMessage.java b/core/src/main/java/flex/messaging/messages/RPCMessage.java
similarity index 100%
rename from core/src/flex/messaging/messages/RPCMessage.java
rename to core/src/main/java/flex/messaging/messages/RPCMessage.java
diff --git a/core/src/flex/messaging/messages/RemotingMessage.java b/core/src/main/java/flex/messaging/messages/RemotingMessage.java
similarity index 100%
rename from core/src/flex/messaging/messages/RemotingMessage.java
rename to core/src/main/java/flex/messaging/messages/RemotingMessage.java
diff --git a/core/src/flex/messaging/messages/SOAPMessage.java b/core/src/main/java/flex/messaging/messages/SOAPMessage.java
similarity index 100%
rename from core/src/flex/messaging/messages/SOAPMessage.java
rename to core/src/main/java/flex/messaging/messages/SOAPMessage.java
diff --git a/core/src/flex/messaging/messages/SmallMessage.java b/core/src/main/java/flex/messaging/messages/SmallMessage.java
similarity index 100%
rename from core/src/flex/messaging/messages/SmallMessage.java
rename to core/src/main/java/flex/messaging/messages/SmallMessage.java
diff --git a/core/src/flex/messaging/messages/package-info.java b/core/src/main/java/flex/messaging/messages/package-info.java
similarity index 100%
rename from core/src/flex/messaging/messages/package-info.java
rename to core/src/main/java/flex/messaging/messages/package-info.java
diff --git a/core/src/flex/messaging/package-info.java b/core/src/main/java/flex/messaging/package-info.java
similarity index 100%
rename from core/src/flex/messaging/package-info.java
rename to core/src/main/java/flex/messaging/package-info.java
diff --git a/core/src/flex/messaging/security/AppServerLoginCommand.java b/core/src/main/java/flex/messaging/security/AppServerLoginCommand.java
similarity index 100%
rename from core/src/flex/messaging/security/AppServerLoginCommand.java
rename to core/src/main/java/flex/messaging/security/AppServerLoginCommand.java
diff --git a/core/src/flex/messaging/security/LoginCommand.java b/core/src/main/java/flex/messaging/security/LoginCommand.java
similarity index 100%
rename from core/src/flex/messaging/security/LoginCommand.java
rename to core/src/main/java/flex/messaging/security/LoginCommand.java
diff --git a/core/src/flex/messaging/security/LoginCommandExt.java b/core/src/main/java/flex/messaging/security/LoginCommandExt.java
similarity index 100%
rename from core/src/flex/messaging/security/LoginCommandExt.java
rename to core/src/main/java/flex/messaging/security/LoginCommandExt.java
diff --git a/core/src/flex/messaging/security/LoginManager.java b/core/src/main/java/flex/messaging/security/LoginManager.java
similarity index 100%
rename from core/src/flex/messaging/security/LoginManager.java
rename to core/src/main/java/flex/messaging/security/LoginManager.java
diff --git a/core/src/flex/messaging/security/MessagingSecurity.java b/core/src/main/java/flex/messaging/security/MessagingSecurity.java
similarity index 100%
rename from core/src/flex/messaging/security/MessagingSecurity.java
rename to core/src/main/java/flex/messaging/security/MessagingSecurity.java
diff --git a/core/src/flex/messaging/security/PrincipalConverter.java b/core/src/main/java/flex/messaging/security/PrincipalConverter.java
similarity index 100%
rename from core/src/flex/messaging/security/PrincipalConverter.java
rename to core/src/main/java/flex/messaging/security/PrincipalConverter.java
diff --git a/core/src/flex/messaging/security/SecurityException.java b/core/src/main/java/flex/messaging/security/SecurityException.java
similarity index 100%
rename from core/src/flex/messaging/security/SecurityException.java
rename to core/src/main/java/flex/messaging/security/SecurityException.java
diff --git a/core/src/flex/messaging/security/package-info.java b/core/src/main/java/flex/messaging/security/package-info.java
similarity index 100%
rename from core/src/flex/messaging/security/package-info.java
rename to core/src/main/java/flex/messaging/security/package-info.java
diff --git a/core/src/flex/messaging/services/AbstractBootstrapService.java b/core/src/main/java/flex/messaging/services/AbstractBootstrapService.java
similarity index 100%
rename from core/src/flex/messaging/services/AbstractBootstrapService.java
rename to core/src/main/java/flex/messaging/services/AbstractBootstrapService.java
diff --git a/core/src/flex/messaging/services/AbstractService.java b/core/src/main/java/flex/messaging/services/AbstractService.java
similarity index 100%
rename from core/src/flex/messaging/services/AbstractService.java
rename to core/src/main/java/flex/messaging/services/AbstractService.java
diff --git a/core/src/flex/messaging/services/AuthenticationEvent.java b/core/src/main/java/flex/messaging/services/AuthenticationEvent.java
similarity index 100%
rename from core/src/flex/messaging/services/AuthenticationEvent.java
rename to core/src/main/java/flex/messaging/services/AuthenticationEvent.java
diff --git a/core/src/flex/messaging/services/AuthenticationListener.java b/core/src/main/java/flex/messaging/services/AuthenticationListener.java
similarity index 100%
rename from core/src/flex/messaging/services/AuthenticationListener.java
rename to core/src/main/java/flex/messaging/services/AuthenticationListener.java
diff --git a/core/src/flex/messaging/services/AuthenticationService.java b/core/src/main/java/flex/messaging/services/AuthenticationService.java
similarity index 100%
rename from core/src/flex/messaging/services/AuthenticationService.java
rename to core/src/main/java/flex/messaging/services/AuthenticationService.java
diff --git a/core/src/flex/messaging/services/MessageService.java b/core/src/main/java/flex/messaging/services/MessageService.java
similarity index 100%
rename from core/src/flex/messaging/services/MessageService.java
rename to core/src/main/java/flex/messaging/services/MessageService.java
diff --git a/core/src/flex/messaging/services/Service.java b/core/src/main/java/flex/messaging/services/Service.java
similarity index 100%
rename from core/src/flex/messaging/services/Service.java
rename to core/src/main/java/flex/messaging/services/Service.java
diff --git a/core/src/flex/messaging/services/ServiceAdapter.java b/core/src/main/java/flex/messaging/services/ServiceAdapter.java
similarity index 100%
rename from core/src/flex/messaging/services/ServiceAdapter.java
rename to core/src/main/java/flex/messaging/services/ServiceAdapter.java
diff --git a/core/src/flex/messaging/services/ServiceException.java b/core/src/main/java/flex/messaging/services/ServiceException.java
similarity index 100%
rename from core/src/flex/messaging/services/ServiceException.java
rename to core/src/main/java/flex/messaging/services/ServiceException.java
diff --git a/core/src/flex/messaging/services/messaging/MessageFrequency.java b/core/src/main/java/flex/messaging/services/messaging/MessageFrequency.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/MessageFrequency.java
rename to core/src/main/java/flex/messaging/services/messaging/MessageFrequency.java
diff --git a/core/src/flex/messaging/services/messaging/MessagingConstants.java b/core/src/main/java/flex/messaging/services/messaging/MessagingConstants.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/MessagingConstants.java
rename to core/src/main/java/flex/messaging/services/messaging/MessagingConstants.java
diff --git a/core/src/flex/messaging/services/messaging/RemoteMessageClient.java b/core/src/main/java/flex/messaging/services/messaging/RemoteMessageClient.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/RemoteMessageClient.java
rename to core/src/main/java/flex/messaging/services/messaging/RemoteMessageClient.java
diff --git a/core/src/flex/messaging/services/messaging/RemoteSubscriptionManager.java b/core/src/main/java/flex/messaging/services/messaging/RemoteSubscriptionManager.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/RemoteSubscriptionManager.java
rename to core/src/main/java/flex/messaging/services/messaging/RemoteSubscriptionManager.java
diff --git a/core/src/flex/messaging/services/messaging/SubscriptionManager.java b/core/src/main/java/flex/messaging/services/messaging/SubscriptionManager.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/SubscriptionManager.java
rename to core/src/main/java/flex/messaging/services/messaging/SubscriptionManager.java
diff --git a/core/src/flex/messaging/services/messaging/Subtopic.java b/core/src/main/java/flex/messaging/services/messaging/Subtopic.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/Subtopic.java
rename to core/src/main/java/flex/messaging/services/messaging/Subtopic.java
diff --git a/core/src/flex/messaging/services/messaging/ThrottleManager.java b/core/src/main/java/flex/messaging/services/messaging/ThrottleManager.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/ThrottleManager.java
rename to core/src/main/java/flex/messaging/services/messaging/ThrottleManager.java
diff --git a/core/src/flex/messaging/services/messaging/adapters/ActionScriptAdapter.java b/core/src/main/java/flex/messaging/services/messaging/adapters/ActionScriptAdapter.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/adapters/ActionScriptAdapter.java
rename to core/src/main/java/flex/messaging/services/messaging/adapters/ActionScriptAdapter.java
diff --git a/core/src/flex/messaging/services/messaging/adapters/AsyncMessageReceiver.java b/core/src/main/java/flex/messaging/services/messaging/adapters/AsyncMessageReceiver.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/adapters/AsyncMessageReceiver.java
rename to core/src/main/java/flex/messaging/services/messaging/adapters/AsyncMessageReceiver.java
diff --git a/core/src/flex/messaging/services/messaging/adapters/JMSAdapter.java b/core/src/main/java/flex/messaging/services/messaging/adapters/JMSAdapter.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/adapters/JMSAdapter.java
rename to core/src/main/java/flex/messaging/services/messaging/adapters/JMSAdapter.java
diff --git a/core/src/flex/messaging/services/messaging/adapters/JMSConfigConstants.java b/core/src/main/java/flex/messaging/services/messaging/adapters/JMSConfigConstants.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/adapters/JMSConfigConstants.java
rename to core/src/main/java/flex/messaging/services/messaging/adapters/JMSConfigConstants.java
diff --git a/core/src/flex/messaging/services/messaging/adapters/JMSConsumer.java b/core/src/main/java/flex/messaging/services/messaging/adapters/JMSConsumer.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/adapters/JMSConsumer.java
rename to core/src/main/java/flex/messaging/services/messaging/adapters/JMSConsumer.java
diff --git a/core/src/flex/messaging/services/messaging/adapters/JMSExceptionEvent.java b/core/src/main/java/flex/messaging/services/messaging/adapters/JMSExceptionEvent.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/adapters/JMSExceptionEvent.java
rename to core/src/main/java/flex/messaging/services/messaging/adapters/JMSExceptionEvent.java
diff --git a/core/src/flex/messaging/services/messaging/adapters/JMSExceptionListener.java b/core/src/main/java/flex/messaging/services/messaging/adapters/JMSExceptionListener.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/adapters/JMSExceptionListener.java
rename to core/src/main/java/flex/messaging/services/messaging/adapters/JMSExceptionListener.java
diff --git a/core/src/flex/messaging/services/messaging/adapters/JMSMessageEvent.java b/core/src/main/java/flex/messaging/services/messaging/adapters/JMSMessageEvent.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/adapters/JMSMessageEvent.java
rename to core/src/main/java/flex/messaging/services/messaging/adapters/JMSMessageEvent.java
diff --git a/core/src/flex/messaging/services/messaging/adapters/JMSMessageListener.java b/core/src/main/java/flex/messaging/services/messaging/adapters/JMSMessageListener.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/adapters/JMSMessageListener.java
rename to core/src/main/java/flex/messaging/services/messaging/adapters/JMSMessageListener.java
diff --git a/core/src/flex/messaging/services/messaging/adapters/JMSProducer.java b/core/src/main/java/flex/messaging/services/messaging/adapters/JMSProducer.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/adapters/JMSProducer.java
rename to core/src/main/java/flex/messaging/services/messaging/adapters/JMSProducer.java
diff --git a/core/src/flex/messaging/services/messaging/adapters/JMSProxy.java b/core/src/main/java/flex/messaging/services/messaging/adapters/JMSProxy.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/adapters/JMSProxy.java
rename to core/src/main/java/flex/messaging/services/messaging/adapters/JMSProxy.java
diff --git a/core/src/flex/messaging/services/messaging/adapters/JMSQueueConsumer.java b/core/src/main/java/flex/messaging/services/messaging/adapters/JMSQueueConsumer.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/adapters/JMSQueueConsumer.java
rename to core/src/main/java/flex/messaging/services/messaging/adapters/JMSQueueConsumer.java
diff --git a/core/src/flex/messaging/services/messaging/adapters/JMSQueueProducer.java b/core/src/main/java/flex/messaging/services/messaging/adapters/JMSQueueProducer.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/adapters/JMSQueueProducer.java
rename to core/src/main/java/flex/messaging/services/messaging/adapters/JMSQueueProducer.java
diff --git a/core/src/flex/messaging/services/messaging/adapters/JMSSettings.java b/core/src/main/java/flex/messaging/services/messaging/adapters/JMSSettings.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/adapters/JMSSettings.java
rename to core/src/main/java/flex/messaging/services/messaging/adapters/JMSSettings.java
diff --git a/core/src/flex/messaging/services/messaging/adapters/JMSTopicConsumer.java b/core/src/main/java/flex/messaging/services/messaging/adapters/JMSTopicConsumer.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/adapters/JMSTopicConsumer.java
rename to core/src/main/java/flex/messaging/services/messaging/adapters/JMSTopicConsumer.java
diff --git a/core/src/flex/messaging/services/messaging/adapters/JMSTopicProducer.java b/core/src/main/java/flex/messaging/services/messaging/adapters/JMSTopicProducer.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/adapters/JMSTopicProducer.java
rename to core/src/main/java/flex/messaging/services/messaging/adapters/JMSTopicProducer.java
diff --git a/core/src/flex/messaging/services/messaging/adapters/MessageReceiver.java b/core/src/main/java/flex/messaging/services/messaging/adapters/MessageReceiver.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/adapters/MessageReceiver.java
rename to core/src/main/java/flex/messaging/services/messaging/adapters/MessageReceiver.java
diff --git a/core/src/flex/messaging/services/messaging/adapters/MessagingAdapter.java b/core/src/main/java/flex/messaging/services/messaging/adapters/MessagingAdapter.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/adapters/MessagingAdapter.java
rename to core/src/main/java/flex/messaging/services/messaging/adapters/MessagingAdapter.java
diff --git a/core/src/flex/messaging/services/messaging/adapters/MessagingSecurityConstraintManager.java b/core/src/main/java/flex/messaging/services/messaging/adapters/MessagingSecurityConstraintManager.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/adapters/MessagingSecurityConstraintManager.java
rename to core/src/main/java/flex/messaging/services/messaging/adapters/MessagingSecurityConstraintManager.java
diff --git a/core/src/flex/messaging/services/messaging/adapters/SyncMessageReceiver.java b/core/src/main/java/flex/messaging/services/messaging/adapters/SyncMessageReceiver.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/adapters/SyncMessageReceiver.java
rename to core/src/main/java/flex/messaging/services/messaging/adapters/SyncMessageReceiver.java
diff --git a/core/src/flex/messaging/services/messaging/adapters/package-info.java b/core/src/main/java/flex/messaging/services/messaging/adapters/package-info.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/adapters/package-info.java
rename to core/src/main/java/flex/messaging/services/messaging/adapters/package-info.java
diff --git a/core/src/flex/messaging/services/messaging/package-info.java b/core/src/main/java/flex/messaging/services/messaging/package-info.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/package-info.java
rename to core/src/main/java/flex/messaging/services/messaging/package-info.java
diff --git a/core/src/flex/messaging/services/messaging/selector/JMSSelector.java b/core/src/main/java/flex/messaging/services/messaging/selector/JMSSelector.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/selector/JMSSelector.java
rename to core/src/main/java/flex/messaging/services/messaging/selector/JMSSelector.java
diff --git a/core/src/flex/messaging/services/messaging/selector/JMSSelectorException.java b/core/src/main/java/flex/messaging/services/messaging/selector/JMSSelectorException.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/selector/JMSSelectorException.java
rename to core/src/main/java/flex/messaging/services/messaging/selector/JMSSelectorException.java
diff --git a/core/src/flex/messaging/services/messaging/selector/package-info.java b/core/src/main/java/flex/messaging/services/messaging/selector/package-info.java
similarity index 100%
rename from core/src/flex/messaging/services/messaging/selector/package-info.java
rename to core/src/main/java/flex/messaging/services/messaging/selector/package-info.java
diff --git a/core/src/flex/messaging/services/package-info.java b/core/src/main/java/flex/messaging/services/package-info.java
similarity index 100%
rename from core/src/flex/messaging/services/package-info.java
rename to core/src/main/java/flex/messaging/services/package-info.java
diff --git a/core/src/flex/messaging/util/Assert.java b/core/src/main/java/flex/messaging/util/Assert.java
similarity index 100%
rename from core/src/flex/messaging/util/Assert.java
rename to core/src/main/java/flex/messaging/util/Assert.java
diff --git a/core/src/flex/messaging/util/AssertionFailedError.java b/core/src/main/java/flex/messaging/util/AssertionFailedError.java
similarity index 100%
rename from core/src/flex/messaging/util/AssertionFailedError.java
rename to core/src/main/java/flex/messaging/util/AssertionFailedError.java
diff --git a/core/src/flex/messaging/util/Base64.java b/core/src/main/java/flex/messaging/util/Base64.java
similarity index 100%
rename from core/src/flex/messaging/util/Base64.java
rename to core/src/main/java/flex/messaging/util/Base64.java
diff --git a/core/src/flex/messaging/util/ClassUtil.java b/core/src/main/java/flex/messaging/util/ClassUtil.java
similarity index 100%
rename from core/src/flex/messaging/util/ClassUtil.java
rename to core/src/main/java/flex/messaging/util/ClassUtil.java
diff --git a/core/src/flex/messaging/util/Diag.jsl b/core/src/main/java/flex/messaging/util/Diag.jsl
similarity index 100%
rename from core/src/flex/messaging/util/Diag.jsl
rename to core/src/main/java/flex/messaging/util/Diag.jsl
diff --git a/core/src/flex/messaging/util/DoubleUtil.java b/core/src/main/java/flex/messaging/util/DoubleUtil.java
similarity index 100%
rename from core/src/flex/messaging/util/DoubleUtil.java
rename to core/src/main/java/flex/messaging/util/DoubleUtil.java
diff --git a/core/src/flex/messaging/util/DoubleUtil.jsl b/core/src/main/java/flex/messaging/util/DoubleUtil.jsl
similarity index 100%
rename from core/src/flex/messaging/util/DoubleUtil.jsl
rename to core/src/main/java/flex/messaging/util/DoubleUtil.jsl
diff --git a/core/src/flex/messaging/util/Hex.java b/core/src/main/java/flex/messaging/util/Hex.java
similarity index 100%
rename from core/src/flex/messaging/util/Hex.java
rename to core/src/main/java/flex/messaging/util/Hex.java
diff --git a/core/src/flex/messaging/util/MethodKey.java b/core/src/main/java/flex/messaging/util/MethodKey.java
similarity index 100%
rename from core/src/flex/messaging/util/MethodKey.java
rename to core/src/main/java/flex/messaging/util/MethodKey.java
diff --git a/core/src/flex/messaging/util/MethodMatcher.java b/core/src/main/java/flex/messaging/util/MethodMatcher.java
similarity index 100%
rename from core/src/flex/messaging/util/MethodMatcher.java
rename to core/src/main/java/flex/messaging/util/MethodMatcher.java
diff --git a/core/src/flex/messaging/util/RedeployManager.java b/core/src/main/java/flex/messaging/util/RedeployManager.java
similarity index 100%
rename from core/src/flex/messaging/util/RedeployManager.java
rename to core/src/main/java/flex/messaging/util/RedeployManager.java
diff --git a/core/src/flex/messaging/util/SettingsReplaceUtil.java b/core/src/main/java/flex/messaging/util/SettingsReplaceUtil.java
similarity index 100%
rename from core/src/flex/messaging/util/SettingsReplaceUtil.java
rename to core/src/main/java/flex/messaging/util/SettingsReplaceUtil.java
diff --git a/core/src/flex/messaging/util/TimeoutAbstractObject.java b/core/src/main/java/flex/messaging/util/TimeoutAbstractObject.java
similarity index 100%
rename from core/src/flex/messaging/util/TimeoutAbstractObject.java
rename to core/src/main/java/flex/messaging/util/TimeoutAbstractObject.java
diff --git a/core/src/flex/messaging/util/TimeoutCapable.java b/core/src/main/java/flex/messaging/util/TimeoutCapable.java
similarity index 100%
rename from core/src/flex/messaging/util/TimeoutCapable.java
rename to core/src/main/java/flex/messaging/util/TimeoutCapable.java
diff --git a/core/src/flex/messaging/util/TimeoutManager.java b/core/src/main/java/flex/messaging/util/TimeoutManager.java
similarity index 100%
rename from core/src/flex/messaging/util/TimeoutManager.java
rename to core/src/main/java/flex/messaging/util/TimeoutManager.java
diff --git a/core/src/flex/messaging/util/ToStringPrettyPrinter.java b/core/src/main/java/flex/messaging/util/ToStringPrettyPrinter.java
similarity index 100%
rename from core/src/flex/messaging/util/ToStringPrettyPrinter.java
rename to core/src/main/java/flex/messaging/util/ToStringPrettyPrinter.java
diff --git a/core/src/flex/messaging/util/Trace.java b/core/src/main/java/flex/messaging/util/Trace.java
similarity index 100%
rename from core/src/flex/messaging/util/Trace.java
rename to core/src/main/java/flex/messaging/util/Trace.java
diff --git a/core/src/flex/messaging/util/URLDecoder.java b/core/src/main/java/flex/messaging/util/URLDecoder.java
similarity index 100%
rename from core/src/flex/messaging/util/URLDecoder.java
rename to core/src/main/java/flex/messaging/util/URLDecoder.java
diff --git a/core/src/flex/messaging/util/URLEncoder.java b/core/src/main/java/flex/messaging/util/URLEncoder.java
similarity index 100%
rename from core/src/flex/messaging/util/URLEncoder.java
rename to core/src/main/java/flex/messaging/util/URLEncoder.java
diff --git a/core/src/flex/messaging/util/URLEncoderUtil.java b/core/src/main/java/flex/messaging/util/URLEncoderUtil.java
similarity index 100%
rename from core/src/flex/messaging/util/URLEncoderUtil.java
rename to core/src/main/java/flex/messaging/util/URLEncoderUtil.java
diff --git a/core/src/flex/messaging/util/URLEncoderUtil.jsl b/core/src/main/java/flex/messaging/util/URLEncoderUtil.jsl
similarity index 100%
rename from core/src/flex/messaging/util/URLEncoderUtil.jsl
rename to core/src/main/java/flex/messaging/util/URLEncoderUtil.jsl
diff --git a/core/src/flex/messaging/util/UUIDGenerator.java b/core/src/main/java/flex/messaging/util/UUIDGenerator.java
similarity index 100%
rename from core/src/flex/messaging/util/UUIDGenerator.java
rename to core/src/main/java/flex/messaging/util/UUIDGenerator.java
diff --git a/core/src/flex/messaging/util/UserAgentManager.java b/core/src/main/java/flex/messaging/util/UserAgentManager.java
similarity index 100%
rename from core/src/flex/messaging/util/UserAgentManager.java
rename to core/src/main/java/flex/messaging/util/UserAgentManager.java
diff --git a/core/src/flex/messaging/util/WatchedObject.java b/core/src/main/java/flex/messaging/util/WatchedObject.java
similarity index 100%
rename from core/src/flex/messaging/util/WatchedObject.java
rename to core/src/main/java/flex/messaging/util/WatchedObject.java
diff --git a/core/src/flex/messaging/util/XMLUtil.java b/core/src/main/java/flex/messaging/util/XMLUtil.java
similarity index 100%
rename from core/src/flex/messaging/util/XMLUtil.java
rename to core/src/main/java/flex/messaging/util/XMLUtil.java
diff --git a/core/src/flex/messaging/util/concurrent/DefaultThreadPoolExecutor.java b/core/src/main/java/flex/messaging/util/concurrent/DefaultThreadPoolExecutor.java
similarity index 100%
rename from core/src/flex/messaging/util/concurrent/DefaultThreadPoolExecutor.java
rename to core/src/main/java/flex/messaging/util/concurrent/DefaultThreadPoolExecutor.java
diff --git a/core/src/flex/messaging/util/concurrent/Executor.java b/core/src/main/java/flex/messaging/util/concurrent/Executor.java
similarity index 100%
rename from core/src/flex/messaging/util/concurrent/Executor.java
rename to core/src/main/java/flex/messaging/util/concurrent/Executor.java
diff --git a/core/src/flex/messaging/util/concurrent/FailedExecutionHandler.java b/core/src/main/java/flex/messaging/util/concurrent/FailedExecutionHandler.java
similarity index 100%
rename from core/src/flex/messaging/util/concurrent/FailedExecutionHandler.java
rename to core/src/main/java/flex/messaging/util/concurrent/FailedExecutionHandler.java
diff --git a/core/src/flex/messaging/util/concurrent/package-info.java b/core/src/main/java/flex/messaging/util/concurrent/package-info.java
similarity index 100%
rename from core/src/flex/messaging/util/concurrent/package-info.java
rename to core/src/main/java/flex/messaging/util/concurrent/package-info.java
diff --git a/core/src/flex/messaging/util/package-info.java b/core/src/main/java/flex/messaging/util/package-info.java
similarity index 100%
rename from core/src/flex/messaging/util/package-info.java
rename to core/src/main/java/flex/messaging/util/package-info.java
diff --git a/core/src/flex/messaging/validators/ClassDeserializationValidator.java b/core/src/main/java/flex/messaging/validators/ClassDeserializationValidator.java
similarity index 100%
rename from core/src/flex/messaging/validators/ClassDeserializationValidator.java
rename to core/src/main/java/flex/messaging/validators/ClassDeserializationValidator.java
diff --git a/core/src/flex/messaging/validators/DeserializationValidator.java b/core/src/main/java/flex/messaging/validators/DeserializationValidator.java
similarity index 100%
rename from core/src/flex/messaging/validators/DeserializationValidator.java
rename to core/src/main/java/flex/messaging/validators/DeserializationValidator.java
diff --git a/core/src/flex/messaging/validators/package-info.java b/core/src/main/java/flex/messaging/validators/package-info.java
similarity index 100%
rename from core/src/flex/messaging/validators/package-info.java
rename to core/src/main/java/flex/messaging/validators/package-info.java
diff --git a/testsuite/src/test/java/amfclient/ClientCustomType.java b/core/src/test/java/amfclient/ClientCustomType.java
similarity index 100%
rename from testsuite/src/test/java/amfclient/ClientCustomType.java
rename to core/src/test/java/amfclient/ClientCustomType.java
diff --git a/testsuite/src/test/java/flex/messaging/DestinationTest.java b/core/src/test/java/flex/messaging/DestinationTest.java
similarity index 99%
rename from testsuite/src/test/java/flex/messaging/DestinationTest.java
rename to core/src/test/java/flex/messaging/DestinationTest.java
index edd2fdf..65985a9 100644
--- a/testsuite/src/test/java/flex/messaging/DestinationTest.java
+++ b/core/src/test/java/flex/messaging/DestinationTest.java
@@ -20,7 +20,6 @@
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
@@ -33,6 +32,7 @@
import flex.messaging.services.MessageService;
import flex.messaging.services.ServiceAdapter;
import flex.messaging.services.messaging.adapters.ActionScriptAdapter;
+import org.junit.Assert;
/**
* Important: While adding new tests, make sure you don't create dependencies
diff --git a/testsuite/src/test/java/flex/messaging/MessageBrokerTest.java b/core/src/test/java/flex/messaging/MessageBrokerTest.java
similarity index 99%
rename from testsuite/src/test/java/flex/messaging/MessageBrokerTest.java
rename to core/src/test/java/flex/messaging/MessageBrokerTest.java
index e3c51a3..f5be8d7 100644
--- a/testsuite/src/test/java/flex/messaging/MessageBrokerTest.java
+++ b/core/src/test/java/flex/messaging/MessageBrokerTest.java
@@ -25,7 +25,7 @@
import flex.messaging.factories.JavaFactory;
import flex.messaging.services.MessageService;
import flex.messaging.services.Service;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
diff --git a/testsuite/src/test/java/flex/messaging/client/FlexClientManagerTest.java b/core/src/test/java/flex/messaging/client/FlexClientManagerTest.java
similarity index 95%
rename from testsuite/src/test/java/flex/messaging/client/FlexClientManagerTest.java
rename to core/src/test/java/flex/messaging/client/FlexClientManagerTest.java
index bc2cdd3..3bf5cc3 100644
--- a/testsuite/src/test/java/flex/messaging/client/FlexClientManagerTest.java
+++ b/core/src/test/java/flex/messaging/client/FlexClientManagerTest.java
@@ -17,9 +17,7 @@
package flex.messaging.client;
import flex.messaging.MessageBroker;
-import flex.messaging.MessageBrokerTest;
-import flex.messaging.factories.JavaFactory;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
@@ -27,7 +25,7 @@
/**
* Unit tests for the flex.messaging.client.FlexClientManager
*/
-public class FlexClientManagerTest extends TestCase{
+public class FlexClientManagerTest extends TestCase {
protected MessageBroker broker;
protected FlexClientManager manager;
diff --git a/testsuite/src/test/java/flex/messaging/cluster/SerializationProxyTest.java b/core/src/test/java/flex/messaging/cluster/SerializationProxyTest.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/cluster/SerializationProxyTest.java
rename to core/src/test/java/flex/messaging/cluster/SerializationProxyTest.java
diff --git a/testsuite/src/test/java/flex/messaging/config/ChannelSettingsParseUriTest.java b/core/src/test/java/flex/messaging/config/ChannelSettingsParseUriTest.java
similarity index 99%
rename from testsuite/src/test/java/flex/messaging/config/ChannelSettingsParseUriTest.java
rename to core/src/test/java/flex/messaging/config/ChannelSettingsParseUriTest.java
index 674fa7b..22c68a9 100644
--- a/testsuite/src/test/java/flex/messaging/config/ChannelSettingsParseUriTest.java
+++ b/core/src/test/java/flex/messaging/config/ChannelSettingsParseUriTest.java
@@ -19,7 +19,7 @@
import flex.messaging.endpoints.AMFEndpoint;
import flex.messaging.endpoints.Endpoint;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
diff --git a/testsuite/src/test/java/flex/messaging/config/ConfigurationConfirmation.java b/core/src/test/java/flex/messaging/config/ConfigurationConfirmation.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/ConfigurationConfirmation.java
rename to core/src/test/java/flex/messaging/config/ConfigurationConfirmation.java
diff --git a/testsuite/src/test/java/flex/messaging/config/ConfigurationParserTest.java b/core/src/test/java/flex/messaging/config/ConfigurationParserTest.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/ConfigurationParserTest.java
rename to core/src/test/java/flex/messaging/config/ConfigurationParserTest.java
diff --git a/testsuite/src/test/java/flex/messaging/config/ThrottleSettingsTest.java b/core/src/test/java/flex/messaging/config/ThrottleSettingsTest.java
similarity index 99%
rename from testsuite/src/test/java/flex/messaging/config/ThrottleSettingsTest.java
rename to core/src/test/java/flex/messaging/config/ThrottleSettingsTest.java
index 28c3fbf..019e258 100644
--- a/testsuite/src/test/java/flex/messaging/config/ThrottleSettingsTest.java
+++ b/core/src/test/java/flex/messaging/config/ThrottleSettingsTest.java
@@ -19,7 +19,7 @@
import flex.messaging.config.ThrottleSettings.Policy;
import flex.messaging.services.messaging.ThrottleManager;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
diff --git a/testsuite/src/test/java/flex/messaging/config/services/Confirm1a.java b/core/src/test/java/flex/messaging/config/services/Confirm1a.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/services/Confirm1a.java
rename to core/src/test/java/flex/messaging/config/services/Confirm1a.java
diff --git a/testsuite/src/test/java/flex/messaging/config/services/Confirm1b.java b/core/src/test/java/flex/messaging/config/services/Confirm1b.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/services/Confirm1b.java
rename to core/src/test/java/flex/messaging/config/services/Confirm1b.java
diff --git a/testsuite/src/test/java/flex/messaging/config/services/Confirm1c.java b/core/src/test/java/flex/messaging/config/services/Confirm1c.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/services/Confirm1c.java
rename to core/src/test/java/flex/messaging/config/services/Confirm1c.java
diff --git a/testsuite/src/test/java/flex/messaging/config/services/Confirm1d.java b/core/src/test/java/flex/messaging/config/services/Confirm1d.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/services/Confirm1d.java
rename to core/src/test/java/flex/messaging/config/services/Confirm1d.java
diff --git a/testsuite/src/test/java/flex/messaging/config/services/Confirm1e.java b/core/src/test/java/flex/messaging/config/services/Confirm1e.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/services/Confirm1e.java
rename to core/src/test/java/flex/messaging/config/services/Confirm1e.java
diff --git a/testsuite/src/test/java/flex/messaging/config/services/Confirm1f.java b/core/src/test/java/flex/messaging/config/services/Confirm1f.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/services/Confirm1f.java
rename to core/src/test/java/flex/messaging/config/services/Confirm1f.java
diff --git a/testsuite/src/test/java/flex/messaging/config/services/Confirm1g.java b/core/src/test/java/flex/messaging/config/services/Confirm1g.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/services/Confirm1g.java
rename to core/src/test/java/flex/messaging/config/services/Confirm1g.java
diff --git a/testsuite/src/test/java/flex/messaging/config/services/Confirm1h.java b/core/src/test/java/flex/messaging/config/services/Confirm1h.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/services/Confirm1h.java
rename to core/src/test/java/flex/messaging/config/services/Confirm1h.java
diff --git a/testsuite/src/test/java/flex/messaging/config/services/Confirm1i.java b/core/src/test/java/flex/messaging/config/services/Confirm1i.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/services/Confirm1i.java
rename to core/src/test/java/flex/messaging/config/services/Confirm1i.java
diff --git a/testsuite/src/test/java/flex/messaging/config/services/Confirm1j.java b/core/src/test/java/flex/messaging/config/services/Confirm1j.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/services/Confirm1j.java
rename to core/src/test/java/flex/messaging/config/services/Confirm1j.java
diff --git a/core/src/test/java/flex/messaging/io/ClassDeserializationValidatorTest.java b/core/src/test/java/flex/messaging/io/ClassDeserializationValidatorTest.java
new file mode 100644
index 0000000..f61f5f7
--- /dev/null
+++ b/core/src/test/java/flex/messaging/io/ClassDeserializationValidatorTest.java
@@ -0,0 +1,7 @@
+package flex.messaging.io;
+
+/**
+ * Created by christoferdutz on 09.08.16.
+ */
+public class ClassDeserializationValidatorTest {
+}
diff --git a/testsuite/src/test/java/flex/messaging/io/amf/AmfDeserializerTest.java b/core/src/test/java/flex/messaging/io/amf/AmfDeserializerTest.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amf/AmfDeserializerTest.java
rename to core/src/test/java/flex/messaging/io/amf/AmfDeserializerTest.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amf/MessageGenerator.java b/core/src/test/java/flex/messaging/io/amf/MessageGenerator.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amf/MessageGenerator.java
rename to core/src/test/java/flex/messaging/io/amf/MessageGenerator.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amf/client/AMFConnectionIT.java b/core/src/test/java/flex/messaging/io/amf/client/AMFConnectionIT.java
similarity index 99%
rename from testsuite/src/test/java/flex/messaging/io/amf/client/AMFConnectionIT.java
rename to core/src/test/java/flex/messaging/io/amf/client/AMFConnectionIT.java
index 26eaf7c..134315c 100644
--- a/testsuite/src/test/java/flex/messaging/io/amf/client/AMFConnectionIT.java
+++ b/core/src/test/java/flex/messaging/io/amf/client/AMFConnectionIT.java
@@ -23,7 +23,7 @@
import flex.messaging.util.TestServerWrapper;
import junit.extensions.TestSetup;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
diff --git a/testsuite/src/test/java/flex/messaging/io/amf/client/AMFDataTypeIT.java b/core/src/test/java/flex/messaging/io/amf/client/AMFDataTypeIT.java
similarity index 99%
rename from testsuite/src/test/java/flex/messaging/io/amf/client/AMFDataTypeIT.java
rename to core/src/test/java/flex/messaging/io/amf/client/AMFDataTypeIT.java
index 724a407..e7706b0 100644
--- a/testsuite/src/test/java/flex/messaging/io/amf/client/AMFDataTypeIT.java
+++ b/core/src/test/java/flex/messaging/io/amf/client/AMFDataTypeIT.java
@@ -23,7 +23,7 @@
import junit.extensions.TestSetup;
import org.w3c.dom.Document;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
diff --git a/testsuite/src/test/java/flex/messaging/io/amf/translator/HashReferenceTableTest.java b/core/src/test/java/flex/messaging/io/amf/translator/HashReferenceTableTest.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amf/translator/HashReferenceTableTest.java
rename to core/src/test/java/flex/messaging/io/amf/translator/HashReferenceTableTest.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amf/translator/StrictReferenceTableTest.java b/core/src/test/java/flex/messaging/io/amf/translator/StrictReferenceTableTest.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amf/translator/StrictReferenceTableTest.java
rename to core/src/test/java/flex/messaging/io/amf/translator/StrictReferenceTableTest.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amf/validators/AmfDeserializationValidatorTest.java b/core/src/test/java/flex/messaging/io/amf/validators/AmfDeserializationValidatorTest.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amf/validators/AmfDeserializationValidatorTest.java
rename to core/src/test/java/flex/messaging/io/amf/validators/AmfDeserializationValidatorTest.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/AllowDocumentTypeDeclaration.java b/core/src/test/java/flex/messaging/io/amfx/AllowDocumentTypeDeclaration.java
similarity index 99%
rename from testsuite/src/test/java/flex/messaging/io/amfx/AllowDocumentTypeDeclaration.java
rename to core/src/test/java/flex/messaging/io/amfx/AllowDocumentTypeDeclaration.java
index c4427e7..e1e1bb3 100644
--- a/testsuite/src/test/java/flex/messaging/io/amfx/AllowDocumentTypeDeclaration.java
+++ b/core/src/test/java/flex/messaging/io/amfx/AllowDocumentTypeDeclaration.java
@@ -20,7 +20,7 @@
import flex.messaging.MessageException;
import flex.messaging.util.XMLUtil;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
import java.io.BufferedReader;
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/AmfxSerializationTest.java b/core/src/test/java/flex/messaging/io/amfx/AmfxSerializationTest.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/AmfxSerializationTest.java
rename to core/src/test/java/flex/messaging/io/amfx/AmfxSerializationTest.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/DeserializationConfirmation.java b/core/src/test/java/flex/messaging/io/amfx/DeserializationConfirmation.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/DeserializationConfirmation.java
rename to core/src/test/java/flex/messaging/io/amfx/DeserializationConfirmation.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/amfx_tag/Confirm1a.java b/core/src/test/java/flex/messaging/io/amfx/amfx_tag/Confirm1a.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/amfx_tag/Confirm1a.java
rename to core/src/test/java/flex/messaging/io/amfx/amfx_tag/Confirm1a.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/amfx_tag/Confirm1b.java b/core/src/test/java/flex/messaging/io/amfx/amfx_tag/Confirm1b.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/amfx_tag/Confirm1b.java
rename to core/src/test/java/flex/messaging/io/amfx/amfx_tag/Confirm1b.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/amfx_tag/Confirm1c.java b/core/src/test/java/flex/messaging/io/amfx/amfx_tag/Confirm1c.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/amfx_tag/Confirm1c.java
rename to core/src/test/java/flex/messaging/io/amfx/amfx_tag/Confirm1c.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2a.java b/core/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2a.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2a.java
rename to core/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2a.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2b.java b/core/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2b.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2b.java
rename to core/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2b.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2c.java b/core/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2c.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2c.java
rename to core/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2c.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2d.java b/core/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2d.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2d.java
rename to core/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2d.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2e.java b/core/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2e.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2e.java
rename to core/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2e.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2f.java b/core/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2f.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2f.java
rename to core/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2f.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2g.java b/core/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2g.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2g.java
rename to core/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2g.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2h.java b/core/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2h.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2h.java
rename to core/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2h.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2i.java b/core/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2i.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2i.java
rename to core/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2i.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2j.java b/core/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2j.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2j.java
rename to core/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2j.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2k.java b/core/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2k.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2k.java
rename to core/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2k.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2l.java b/core/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2l.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2l.java
rename to core/src/test/java/flex/messaging/io/amfx/array_tag/Confirm2l.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/body_tag/Confirm3a.java b/core/src/test/java/flex/messaging/io/amfx/body_tag/Confirm3a.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/body_tag/Confirm3a.java
rename to core/src/test/java/flex/messaging/io/amfx/body_tag/Confirm3a.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/body_tag/Confirm3b.java b/core/src/test/java/flex/messaging/io/amfx/body_tag/Confirm3b.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/body_tag/Confirm3b.java
rename to core/src/test/java/flex/messaging/io/amfx/body_tag/Confirm3b.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/body_tag/Confirm3c.java b/core/src/test/java/flex/messaging/io/amfx/body_tag/Confirm3c.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/body_tag/Confirm3c.java
rename to core/src/test/java/flex/messaging/io/amfx/body_tag/Confirm3c.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/body_tag/Confirm3d.java b/core/src/test/java/flex/messaging/io/amfx/body_tag/Confirm3d.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/body_tag/Confirm3d.java
rename to core/src/test/java/flex/messaging/io/amfx/body_tag/Confirm3d.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/bytes_tag/Confirm16a.java b/core/src/test/java/flex/messaging/io/amfx/bytes_tag/Confirm16a.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/bytes_tag/Confirm16a.java
rename to core/src/test/java/flex/messaging/io/amfx/bytes_tag/Confirm16a.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/date_tag/Confirm4a.java b/core/src/test/java/flex/messaging/io/amfx/date_tag/Confirm4a.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/date_tag/Confirm4a.java
rename to core/src/test/java/flex/messaging/io/amfx/date_tag/Confirm4a.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/date_tag/Confirm4b.java b/core/src/test/java/flex/messaging/io/amfx/date_tag/Confirm4b.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/date_tag/Confirm4b.java
rename to core/src/test/java/flex/messaging/io/amfx/date_tag/Confirm4b.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/date_tag/Confirm4c.java b/core/src/test/java/flex/messaging/io/amfx/date_tag/Confirm4c.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/date_tag/Confirm4c.java
rename to core/src/test/java/flex/messaging/io/amfx/date_tag/Confirm4c.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/date_tag/Confirm4d.java b/core/src/test/java/flex/messaging/io/amfx/date_tag/Confirm4d.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/date_tag/Confirm4d.java
rename to core/src/test/java/flex/messaging/io/amfx/date_tag/Confirm4d.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/date_tag/Confirm4e.java b/core/src/test/java/flex/messaging/io/amfx/date_tag/Confirm4e.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/date_tag/Confirm4e.java
rename to core/src/test/java/flex/messaging/io/amfx/date_tag/Confirm4e.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/date_tag/Confirm4f.java b/core/src/test/java/flex/messaging/io/amfx/date_tag/Confirm4f.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/date_tag/Confirm4f.java
rename to core/src/test/java/flex/messaging/io/amfx/date_tag/Confirm4f.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/date_tag/Confirm4g.java b/core/src/test/java/flex/messaging/io/amfx/date_tag/Confirm4g.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/date_tag/Confirm4g.java
rename to core/src/test/java/flex/messaging/io/amfx/date_tag/Confirm4g.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5a.java b/core/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5a.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5a.java
rename to core/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5a.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5b.java b/core/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5b.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5b.java
rename to core/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5b.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5c.java b/core/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5c.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5c.java
rename to core/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5c.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5d.java b/core/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5d.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5d.java
rename to core/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5d.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5e.java b/core/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5e.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5e.java
rename to core/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5e.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5f.java b/core/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5f.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5f.java
rename to core/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5f.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5g.java b/core/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5g.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5g.java
rename to core/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5g.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5h.java b/core/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5h.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5h.java
rename to core/src/test/java/flex/messaging/io/amfx/double_tag/Confirm5h.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/false_tag/Confirm6a.java b/core/src/test/java/flex/messaging/io/amfx/false_tag/Confirm6a.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/false_tag/Confirm6a.java
rename to core/src/test/java/flex/messaging/io/amfx/false_tag/Confirm6a.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/false_tag/Confirm6b.java b/core/src/test/java/flex/messaging/io/amfx/false_tag/Confirm6b.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/false_tag/Confirm6b.java
rename to core/src/test/java/flex/messaging/io/amfx/false_tag/Confirm6b.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/false_tag/Confirm6c.java b/core/src/test/java/flex/messaging/io/amfx/false_tag/Confirm6c.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/false_tag/Confirm6c.java
rename to core/src/test/java/flex/messaging/io/amfx/false_tag/Confirm6c.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/false_tag/Confirm6d.java b/core/src/test/java/flex/messaging/io/amfx/false_tag/Confirm6d.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/false_tag/Confirm6d.java
rename to core/src/test/java/flex/messaging/io/amfx/false_tag/Confirm6d.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/header_tag/Confirm7a.java b/core/src/test/java/flex/messaging/io/amfx/header_tag/Confirm7a.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/header_tag/Confirm7a.java
rename to core/src/test/java/flex/messaging/io/amfx/header_tag/Confirm7a.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/header_tag/Confirm7b.java b/core/src/test/java/flex/messaging/io/amfx/header_tag/Confirm7b.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/header_tag/Confirm7b.java
rename to core/src/test/java/flex/messaging/io/amfx/header_tag/Confirm7b.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/header_tag/Confirm7c.java b/core/src/test/java/flex/messaging/io/amfx/header_tag/Confirm7c.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/header_tag/Confirm7c.java
rename to core/src/test/java/flex/messaging/io/amfx/header_tag/Confirm7c.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/header_tag/Confirm7d.java b/core/src/test/java/flex/messaging/io/amfx/header_tag/Confirm7d.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/header_tag/Confirm7d.java
rename to core/src/test/java/flex/messaging/io/amfx/header_tag/Confirm7d.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/int_tag/Confirm8a.java b/core/src/test/java/flex/messaging/io/amfx/int_tag/Confirm8a.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/int_tag/Confirm8a.java
rename to core/src/test/java/flex/messaging/io/amfx/int_tag/Confirm8a.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/int_tag/Confirm8b.java b/core/src/test/java/flex/messaging/io/amfx/int_tag/Confirm8b.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/int_tag/Confirm8b.java
rename to core/src/test/java/flex/messaging/io/amfx/int_tag/Confirm8b.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/int_tag/Confirm8c.java b/core/src/test/java/flex/messaging/io/amfx/int_tag/Confirm8c.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/int_tag/Confirm8c.java
rename to core/src/test/java/flex/messaging/io/amfx/int_tag/Confirm8c.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/int_tag/Confirm8d.java b/core/src/test/java/flex/messaging/io/amfx/int_tag/Confirm8d.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/int_tag/Confirm8d.java
rename to core/src/test/java/flex/messaging/io/amfx/int_tag/Confirm8d.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/int_tag/Confirm8e.java b/core/src/test/java/flex/messaging/io/amfx/int_tag/Confirm8e.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/int_tag/Confirm8e.java
rename to core/src/test/java/flex/messaging/io/amfx/int_tag/Confirm8e.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/int_tag/Confirm8f.java b/core/src/test/java/flex/messaging/io/amfx/int_tag/Confirm8f.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/int_tag/Confirm8f.java
rename to core/src/test/java/flex/messaging/io/amfx/int_tag/Confirm8f.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/int_tag/Confirm8g.java b/core/src/test/java/flex/messaging/io/amfx/int_tag/Confirm8g.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/int_tag/Confirm8g.java
rename to core/src/test/java/flex/messaging/io/amfx/int_tag/Confirm8g.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/null_tag/Confirm9a.java b/core/src/test/java/flex/messaging/io/amfx/null_tag/Confirm9a.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/null_tag/Confirm9a.java
rename to core/src/test/java/flex/messaging/io/amfx/null_tag/Confirm9a.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/null_tag/Confirm9b.java b/core/src/test/java/flex/messaging/io/amfx/null_tag/Confirm9b.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/null_tag/Confirm9b.java
rename to core/src/test/java/flex/messaging/io/amfx/null_tag/Confirm9b.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/null_tag/Confirm9c.java b/core/src/test/java/flex/messaging/io/amfx/null_tag/Confirm9c.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/null_tag/Confirm9c.java
rename to core/src/test/java/flex/messaging/io/amfx/null_tag/Confirm9c.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/null_tag/Confirm9d.java b/core/src/test/java/flex/messaging/io/amfx/null_tag/Confirm9d.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/null_tag/Confirm9d.java
rename to core/src/test/java/flex/messaging/io/amfx/null_tag/Confirm9d.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/object_tag/Confirm10a.java b/core/src/test/java/flex/messaging/io/amfx/object_tag/Confirm10a.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/object_tag/Confirm10a.java
rename to core/src/test/java/flex/messaging/io/amfx/object_tag/Confirm10a.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/object_tag/Confirm10b.java b/core/src/test/java/flex/messaging/io/amfx/object_tag/Confirm10b.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/object_tag/Confirm10b.java
rename to core/src/test/java/flex/messaging/io/amfx/object_tag/Confirm10b.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/object_tag/Confirm10c.java b/core/src/test/java/flex/messaging/io/amfx/object_tag/Confirm10c.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/object_tag/Confirm10c.java
rename to core/src/test/java/flex/messaging/io/amfx/object_tag/Confirm10c.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/object_tag/Confirm10d.java b/core/src/test/java/flex/messaging/io/amfx/object_tag/Confirm10d.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/object_tag/Confirm10d.java
rename to core/src/test/java/flex/messaging/io/amfx/object_tag/Confirm10d.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11a.java b/core/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11a.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11a.java
rename to core/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11a.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11b.java b/core/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11b.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11b.java
rename to core/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11b.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11c.java b/core/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11c.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11c.java
rename to core/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11c.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11d.java b/core/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11d.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11d.java
rename to core/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11d.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11e.java b/core/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11e.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11e.java
rename to core/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11e.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11f.java b/core/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11f.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11f.java
rename to core/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11f.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11g.java b/core/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11g.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11g.java
rename to core/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11g.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11h.java b/core/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11h.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11h.java
rename to core/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11h.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11i.java b/core/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11i.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11i.java
rename to core/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11i.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11j.java b/core/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11j.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11j.java
rename to core/src/test/java/flex/messaging/io/amfx/string_tag/Confirm11j.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/testtypes/Bleu_dAuvergne.java b/core/src/test/java/flex/messaging/io/amfx/testtypes/Bleu_dAuvergne.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/testtypes/Bleu_dAuvergne.java
rename to core/src/test/java/flex/messaging/io/amfx/testtypes/Bleu_dAuvergne.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/testtypes/Cheese.java b/core/src/test/java/flex/messaging/io/amfx/testtypes/Cheese.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/testtypes/Cheese.java
rename to core/src/test/java/flex/messaging/io/amfx/testtypes/Cheese.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/testtypes/CowCheese.java b/core/src/test/java/flex/messaging/io/amfx/testtypes/CowCheese.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/testtypes/CowCheese.java
rename to core/src/test/java/flex/messaging/io/amfx/testtypes/CowCheese.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/testtypes/EweCheese.java b/core/src/test/java/flex/messaging/io/amfx/testtypes/EweCheese.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/testtypes/EweCheese.java
rename to core/src/test/java/flex/messaging/io/amfx/testtypes/EweCheese.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/testtypes/Roquefort.java b/core/src/test/java/flex/messaging/io/amfx/testtypes/Roquefort.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/testtypes/Roquefort.java
rename to core/src/test/java/flex/messaging/io/amfx/testtypes/Roquefort.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/traits_tag/Confirm12a.java b/core/src/test/java/flex/messaging/io/amfx/traits_tag/Confirm12a.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/traits_tag/Confirm12a.java
rename to core/src/test/java/flex/messaging/io/amfx/traits_tag/Confirm12a.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/traits_tag/Confirm12b.java b/core/src/test/java/flex/messaging/io/amfx/traits_tag/Confirm12b.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/traits_tag/Confirm12b.java
rename to core/src/test/java/flex/messaging/io/amfx/traits_tag/Confirm12b.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/true_tag/Confirm13a.java b/core/src/test/java/flex/messaging/io/amfx/true_tag/Confirm13a.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/true_tag/Confirm13a.java
rename to core/src/test/java/flex/messaging/io/amfx/true_tag/Confirm13a.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/true_tag/Confirm13b.java b/core/src/test/java/flex/messaging/io/amfx/true_tag/Confirm13b.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/true_tag/Confirm13b.java
rename to core/src/test/java/flex/messaging/io/amfx/true_tag/Confirm13b.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/true_tag/Confirm13c.java b/core/src/test/java/flex/messaging/io/amfx/true_tag/Confirm13c.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/true_tag/Confirm13c.java
rename to core/src/test/java/flex/messaging/io/amfx/true_tag/Confirm13c.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/true_tag/Confirm13d.java b/core/src/test/java/flex/messaging/io/amfx/true_tag/Confirm13d.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/true_tag/Confirm13d.java
rename to core/src/test/java/flex/messaging/io/amfx/true_tag/Confirm13d.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/undefined_tag/Confirm14a.java b/core/src/test/java/flex/messaging/io/amfx/undefined_tag/Confirm14a.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/undefined_tag/Confirm14a.java
rename to core/src/test/java/flex/messaging/io/amfx/undefined_tag/Confirm14a.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/undefined_tag/Confirm14b.java b/core/src/test/java/flex/messaging/io/amfx/undefined_tag/Confirm14b.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/undefined_tag/Confirm14b.java
rename to core/src/test/java/flex/messaging/io/amfx/undefined_tag/Confirm14b.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/undefined_tag/Confirm14c.java b/core/src/test/java/flex/messaging/io/amfx/undefined_tag/Confirm14c.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/undefined_tag/Confirm14c.java
rename to core/src/test/java/flex/messaging/io/amfx/undefined_tag/Confirm14c.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/undefined_tag/Confirm14d.java b/core/src/test/java/flex/messaging/io/amfx/undefined_tag/Confirm14d.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/undefined_tag/Confirm14d.java
rename to core/src/test/java/flex/messaging/io/amfx/undefined_tag/Confirm14d.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/xml_tag/Confirm15a.java b/core/src/test/java/flex/messaging/io/amfx/xml_tag/Confirm15a.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/xml_tag/Confirm15a.java
rename to core/src/test/java/flex/messaging/io/amfx/xml_tag/Confirm15a.java
diff --git a/testsuite/src/test/java/flex/messaging/io/amfx/xml_tag/Confirm15b.java b/core/src/test/java/flex/messaging/io/amfx/xml_tag/Confirm15b.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/io/amfx/xml_tag/Confirm15b.java
rename to core/src/test/java/flex/messaging/io/amfx/xml_tag/Confirm15b.java
diff --git a/testsuite/src/test/java/flex/messaging/log/LogTest.java b/core/src/test/java/flex/messaging/log/LogTest.java
similarity index 99%
rename from testsuite/src/test/java/flex/messaging/log/LogTest.java
rename to core/src/test/java/flex/messaging/log/LogTest.java
index 2156440..afcfa48 100644
--- a/testsuite/src/test/java/flex/messaging/log/LogTest.java
+++ b/core/src/test/java/flex/messaging/log/LogTest.java
@@ -20,7 +20,7 @@
import java.util.ArrayList;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
diff --git a/testsuite/src/test/java/flex/messaging/log/LoggerTest.java b/core/src/test/java/flex/messaging/log/LoggerTest.java
similarity index 99%
rename from testsuite/src/test/java/flex/messaging/log/LoggerTest.java
rename to core/src/test/java/flex/messaging/log/LoggerTest.java
index 8f05d67..107db69 100644
--- a/testsuite/src/test/java/flex/messaging/log/LoggerTest.java
+++ b/core/src/test/java/flex/messaging/log/LoggerTest.java
@@ -20,7 +20,7 @@
import junit.framework.TestCase;
import junit.framework.Test;
import junit.framework.TestSuite;
-import junit.framework.Assert;
+import org.junit.Assert;
public class LoggerTest extends TestCase
{
diff --git a/testsuite/src/test/java/flex/messaging/log/TestingTarget.java b/core/src/test/java/flex/messaging/log/TestingTarget.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/log/TestingTarget.java
rename to core/src/test/java/flex/messaging/log/TestingTarget.java
diff --git a/testsuite/src/test/java/flex/messaging/securityadvisories/BlazeDsXmlProcessingXXEVulnerability.java b/core/src/test/java/flex/messaging/securityadvisories/BlazeDsXmlProcessingXXEVulnerability.java
similarity index 80%
rename from testsuite/src/test/java/flex/messaging/securityadvisories/BlazeDsXmlProcessingXXEVulnerability.java
rename to core/src/test/java/flex/messaging/securityadvisories/BlazeDsXmlProcessingXXEVulnerability.java
index 761aa4d..c850f6f 100644
--- a/testsuite/src/test/java/flex/messaging/securityadvisories/BlazeDsXmlProcessingXXEVulnerability.java
+++ b/core/src/test/java/flex/messaging/securityadvisories/BlazeDsXmlProcessingXXEVulnerability.java
@@ -20,9 +20,8 @@
import com.sun.org.apache.xml.internal.serialize.OutputFormat;
import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
-import flex.messaging.util.DoubleUtil;
import flex.messaging.util.XMLUtil;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
import org.w3c.dom.Document;
@@ -46,14 +45,13 @@
out.close();
String uri = temp.toURI().toASCIIString();
- StringBuffer xml = new StringBuffer(512);
- xml.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n");
- xml.append("<!DOCTYPE foo [\r\n");
- xml.append("<!ELEMENT foo ANY >\r\n");
- xml.append("<!ENTITY xxe SYSTEM \"" + uri + "\" >]>\r\n");
- xml.append("<foo>The Secret is: &xxe;</foo>");
+ String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n" +
+ "<!DOCTYPE foo [\r\n" +
+ "<!ELEMENT foo ANY >\r\n" +
+ "<!ENTITY xxe SYSTEM \"" + uri + "\" >]>\r\n" +
+ "<foo>The Secret is: &xxe;</foo>";
- Document data = XMLUtil.stringToDocument(xml.toString());
+ Document data = XMLUtil.stringToDocument(xml);
OutputFormat format = new OutputFormat(data);
StringWriter stringOut = new StringWriter();
diff --git a/testsuite/src/test/java/flex/messaging/services/AbstractServiceTest.java b/core/src/test/java/flex/messaging/services/AbstractServiceTest.java
similarity index 99%
rename from testsuite/src/test/java/flex/messaging/services/AbstractServiceTest.java
rename to core/src/test/java/flex/messaging/services/AbstractServiceTest.java
index bf7ec9a..6c7025b 100644
--- a/testsuite/src/test/java/flex/messaging/services/AbstractServiceTest.java
+++ b/core/src/test/java/flex/messaging/services/AbstractServiceTest.java
@@ -20,7 +20,7 @@
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
diff --git a/testsuite/src/test/java/flex/messaging/services/ServiceAdapterTest.java b/core/src/test/java/flex/messaging/services/ServiceAdapterTest.java
similarity index 98%
rename from testsuite/src/test/java/flex/messaging/services/ServiceAdapterTest.java
rename to core/src/test/java/flex/messaging/services/ServiceAdapterTest.java
index b3315f5..526f7c6 100644
--- a/testsuite/src/test/java/flex/messaging/services/ServiceAdapterTest.java
+++ b/core/src/test/java/flex/messaging/services/ServiceAdapterTest.java
@@ -21,7 +21,7 @@
import flex.messaging.MessageDestination;
import flex.messaging.config.ConfigurationException;
import flex.messaging.services.messaging.adapters.ActionScriptAdapter;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
diff --git a/testsuite/src/test/java/flex/messaging/services/http/SettingsReplaceUtilTest.java b/core/src/test/java/flex/messaging/services/http/SettingsReplaceUtilTest.java
similarity index 99%
rename from testsuite/src/test/java/flex/messaging/services/http/SettingsReplaceUtilTest.java
rename to core/src/test/java/flex/messaging/services/http/SettingsReplaceUtilTest.java
index 16716cf..afd2680 100644
--- a/testsuite/src/test/java/flex/messaging/services/http/SettingsReplaceUtilTest.java
+++ b/core/src/test/java/flex/messaging/services/http/SettingsReplaceUtilTest.java
@@ -23,10 +23,10 @@
import java.util.ArrayList;
import java.util.Set;
-import junit.framework.Assert;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.junit.Assert;
public class SettingsReplaceUtilTest extends TestCase
{
diff --git a/testsuite/src/test/java/flex/messaging/services/messaging/SubtopicTest.java b/core/src/test/java/flex/messaging/services/messaging/SubtopicTest.java
similarity index 98%
rename from testsuite/src/test/java/flex/messaging/services/messaging/SubtopicTest.java
rename to core/src/test/java/flex/messaging/services/messaging/SubtopicTest.java
index 0038495..8286345 100644
--- a/testsuite/src/test/java/flex/messaging/services/messaging/SubtopicTest.java
+++ b/core/src/test/java/flex/messaging/services/messaging/SubtopicTest.java
@@ -16,7 +16,7 @@
*/
package flex.messaging.services.messaging;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
diff --git a/testsuite/src/test/java/flex/messaging/util/Basae64Test.java b/core/src/test/java/flex/messaging/util/Basae64Test.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/util/Basae64Test.java
rename to core/src/test/java/flex/messaging/util/Basae64Test.java
diff --git a/testsuite/src/test/java/flex/messaging/util/HexTest.java b/core/src/test/java/flex/messaging/util/HexTest.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/util/HexTest.java
rename to core/src/test/java/flex/messaging/util/HexTest.java
diff --git a/testsuite/src/test/java/flex/messaging/util/TestServer.java b/core/src/test/java/flex/messaging/util/TestServer.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/util/TestServer.java
rename to core/src/test/java/flex/messaging/util/TestServer.java
diff --git a/testsuite/src/test/java/flex/messaging/util/TestServerWrapper.java b/core/src/test/java/flex/messaging/util/TestServerWrapper.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/util/TestServerWrapper.java
rename to core/src/test/java/flex/messaging/util/TestServerWrapper.java
diff --git a/testsuite/src/test/java/flex/messaging/util/UUIDUtilTest.java b/core/src/test/java/flex/messaging/util/UUIDUtilTest.java
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/util/UUIDUtilTest.java
rename to core/src/test/java/flex/messaging/util/UUIDUtilTest.java
diff --git a/testsuite/src/test/java/flex/messaging/util/concurrent/DefaultThreadPoolExecutorTest.java b/core/src/test/java/flex/messaging/util/concurrent/DefaultThreadPoolExecutorTest.java
similarity index 99%
rename from testsuite/src/test/java/flex/messaging/util/concurrent/DefaultThreadPoolExecutorTest.java
rename to core/src/test/java/flex/messaging/util/concurrent/DefaultThreadPoolExecutorTest.java
index 6946b6f..d3c0286 100644
--- a/testsuite/src/test/java/flex/messaging/util/concurrent/DefaultThreadPoolExecutorTest.java
+++ b/core/src/test/java/flex/messaging/util/concurrent/DefaultThreadPoolExecutorTest.java
@@ -20,7 +20,7 @@
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import junit.framework.Assert;
+import org.junit.Assert;
import java.util.ArrayList;
import java.util.concurrent.ArrayBlockingQueue;
diff --git a/testsuite/src/test/java/macromedia/qa/metrics/AbstractDatabase.java b/core/src/test/java/macromedia/qa/metrics/AbstractDatabase.java
similarity index 100%
rename from testsuite/src/test/java/macromedia/qa/metrics/AbstractDatabase.java
rename to core/src/test/java/macromedia/qa/metrics/AbstractDatabase.java
diff --git a/testsuite/src/test/java/macromedia/qa/metrics/Build.java b/core/src/test/java/macromedia/qa/metrics/Build.java
similarity index 100%
rename from testsuite/src/test/java/macromedia/qa/metrics/Build.java
rename to core/src/test/java/macromedia/qa/metrics/Build.java
diff --git a/testsuite/src/test/java/macromedia/qa/metrics/Metric.java b/core/src/test/java/macromedia/qa/metrics/Metric.java
similarity index 100%
rename from testsuite/src/test/java/macromedia/qa/metrics/Metric.java
rename to core/src/test/java/macromedia/qa/metrics/Metric.java
diff --git a/testsuite/src/test/java/macromedia/qa/metrics/MetricsDatabase.java b/core/src/test/java/macromedia/qa/metrics/MetricsDatabase.java
similarity index 100%
rename from testsuite/src/test/java/macromedia/qa/metrics/MetricsDatabase.java
rename to core/src/test/java/macromedia/qa/metrics/MetricsDatabase.java
diff --git a/testsuite/src/test/java/macromedia/qa/metrics/MetricsManager.java b/core/src/test/java/macromedia/qa/metrics/MetricsManager.java
similarity index 100%
rename from testsuite/src/test/java/macromedia/qa/metrics/MetricsManager.java
rename to core/src/test/java/macromedia/qa/metrics/MetricsManager.java
diff --git a/testsuite/src/test/java/macromedia/qa/metrics/Persistable.java b/core/src/test/java/macromedia/qa/metrics/Persistable.java
similarity index 100%
rename from testsuite/src/test/java/macromedia/qa/metrics/Persistable.java
rename to core/src/test/java/macromedia/qa/metrics/Persistable.java
diff --git a/testsuite/src/test/java/macromedia/qa/metrics/Project.java b/core/src/test/java/macromedia/qa/metrics/Project.java
similarity index 100%
rename from testsuite/src/test/java/macromedia/qa/metrics/Project.java
rename to core/src/test/java/macromedia/qa/metrics/Project.java
diff --git a/testsuite/src/test/java/macromedia/qa/metrics/Run.java b/core/src/test/java/macromedia/qa/metrics/Run.java
similarity index 100%
rename from testsuite/src/test/java/macromedia/qa/metrics/Run.java
rename to core/src/test/java/macromedia/qa/metrics/Run.java
diff --git a/testsuite/src/test/java/macromedia/qa/metrics/Value.java b/core/src/test/java/macromedia/qa/metrics/Value.java
similarity index 100%
rename from testsuite/src/test/java/macromedia/qa/metrics/Value.java
rename to core/src/test/java/macromedia/qa/metrics/Value.java
diff --git a/testsuite/src/test/java/macromedia/util/UnitTrace.java b/core/src/test/java/macromedia/util/UnitTrace.java
similarity index 100%
rename from testsuite/src/test/java/macromedia/util/UnitTrace.java
rename to core/src/test/java/macromedia/util/UnitTrace.java
diff --git a/testsuite/src/test/resources/WEB-INF/flex/remoting-config.xml b/core/src/test/resources/WEB-INF/flex/remoting-config.xml
similarity index 100%
rename from testsuite/src/test/resources/WEB-INF/flex/remoting-config.xml
rename to core/src/test/resources/WEB-INF/flex/remoting-config.xml
diff --git a/testsuite/src/test/resources/WEB-INF/flex/services-config.xml b/core/src/test/resources/WEB-INF/flex/services-config.xml
similarity index 100%
rename from testsuite/src/test/resources/WEB-INF/flex/services-config.xml
rename to core/src/test/resources/WEB-INF/flex/services-config.xml
diff --git a/testsuite/src/test/resources/amf_request.xml b/core/src/test/resources/amf_request.xml
similarity index 100%
rename from testsuite/src/test/resources/amf_request.xml
rename to core/src/test/resources/amf_request.xml
diff --git a/testsuite/src/test/java/flex/messaging/config/services/1a.xml b/core/src/test/resources/flex/messaging/config/services/1a.xml
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/services/1a.xml
rename to core/src/test/resources/flex/messaging/config/services/1a.xml
diff --git a/testsuite/src/test/java/flex/messaging/config/services/1b.xml b/core/src/test/resources/flex/messaging/config/services/1b.xml
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/services/1b.xml
rename to core/src/test/resources/flex/messaging/config/services/1b.xml
diff --git a/testsuite/src/test/java/flex/messaging/config/services/1c.xml b/core/src/test/resources/flex/messaging/config/services/1c.xml
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/services/1c.xml
rename to core/src/test/resources/flex/messaging/config/services/1c.xml
diff --git a/testsuite/src/test/java/flex/messaging/config/services/1d.xml b/core/src/test/resources/flex/messaging/config/services/1d.xml
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/services/1d.xml
rename to core/src/test/resources/flex/messaging/config/services/1d.xml
diff --git a/testsuite/src/test/java/flex/messaging/config/services/1e.xml b/core/src/test/resources/flex/messaging/config/services/1e.xml
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/services/1e.xml
rename to core/src/test/resources/flex/messaging/config/services/1e.xml
diff --git a/testsuite/src/test/java/flex/messaging/config/services/1e_adapter_include.xml b/core/src/test/resources/flex/messaging/config/services/1e_adapter_include.xml
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/services/1e_adapter_include.xml
rename to core/src/test/resources/flex/messaging/config/services/1e_adapter_include.xml
diff --git a/testsuite/src/test/java/flex/messaging/config/services/1e_channel_include.xml b/core/src/test/resources/flex/messaging/config/services/1e_channel_include.xml
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/services/1e_channel_include.xml
rename to core/src/test/resources/flex/messaging/config/services/1e_channel_include.xml
diff --git a/testsuite/src/test/java/flex/messaging/config/services/1e_constraint_include.xml b/core/src/test/resources/flex/messaging/config/services/1e_constraint_include.xml
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/services/1e_constraint_include.xml
rename to core/src/test/resources/flex/messaging/config/services/1e_constraint_include.xml
diff --git a/testsuite/src/test/java/flex/messaging/config/services/1e_destination_include.xml b/core/src/test/resources/flex/messaging/config/services/1e_destination_include.xml
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/services/1e_destination_include.xml
rename to core/src/test/resources/flex/messaging/config/services/1e_destination_include.xml
diff --git a/testsuite/src/test/java/flex/messaging/config/services/1f.xml b/core/src/test/resources/flex/messaging/config/services/1f.xml
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/services/1f.xml
rename to core/src/test/resources/flex/messaging/config/services/1f.xml
diff --git a/testsuite/src/test/java/flex/messaging/config/services/1f_service_include.xml b/core/src/test/resources/flex/messaging/config/services/1f_service_include.xml
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/services/1f_service_include.xml
rename to core/src/test/resources/flex/messaging/config/services/1f_service_include.xml
diff --git a/testsuite/src/test/java/flex/messaging/config/services/1g.xml b/core/src/test/resources/flex/messaging/config/services/1g.xml
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/services/1g.xml
rename to core/src/test/resources/flex/messaging/config/services/1g.xml
diff --git a/testsuite/src/test/java/flex/messaging/config/services/1h.xml b/core/src/test/resources/flex/messaging/config/services/1h.xml
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/services/1h.xml
rename to core/src/test/resources/flex/messaging/config/services/1h.xml
diff --git a/testsuite/src/test/java/flex/messaging/config/services/1i.xml b/core/src/test/resources/flex/messaging/config/services/1i.xml
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/services/1i.xml
rename to core/src/test/resources/flex/messaging/config/services/1i.xml
diff --git a/testsuite/src/test/java/flex/messaging/config/services/1j.xml b/core/src/test/resources/flex/messaging/config/services/1j.xml
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/services/1j.xml
rename to core/src/test/resources/flex/messaging/config/services/1j.xml
diff --git a/testsuite/src/test/java/flex/messaging/config/services/adapters/1i_adapter_include.xml b/core/src/test/resources/flex/messaging/config/services/adapters/1i_adapter_include.xml
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/services/adapters/1i_adapter_include.xml
rename to core/src/test/resources/flex/messaging/config/services/adapters/1i_adapter_include.xml
diff --git a/testsuite/src/test/java/flex/messaging/config/services/channels/1i_channel_include.xml b/core/src/test/resources/flex/messaging/config/services/channels/1i_channel_include.xml
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/services/channels/1i_channel_include.xml
rename to core/src/test/resources/flex/messaging/config/services/channels/1i_channel_include.xml
diff --git a/testsuite/src/test/java/flex/messaging/config/services/constraints/1i_constraint_include.xml b/core/src/test/resources/flex/messaging/config/services/constraints/1i_constraint_include.xml
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/services/constraints/1i_constraint_include.xml
rename to core/src/test/resources/flex/messaging/config/services/constraints/1i_constraint_include.xml
diff --git a/testsuite/src/test/java/flex/messaging/config/services/destinations/1i_destination_include.xml b/core/src/test/resources/flex/messaging/config/services/destinations/1i_destination_include.xml
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/services/destinations/1i_destination_include.xml
rename to core/src/test/resources/flex/messaging/config/services/destinations/1i_destination_include.xml
diff --git a/testsuite/src/test/java/flex/messaging/config/services/services/1i_service_include.xml b/core/src/test/resources/flex/messaging/config/services/services/1i_service_include.xml
similarity index 100%
rename from testsuite/src/test/java/flex/messaging/config/services/services/1i_service_include.xml
rename to core/src/test/resources/flex/messaging/config/services/services/1i_service_include.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/amfx.xsd b/core/src/test/resources/flex/messaging/io/amfx/amfx.xsd
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/amfx.xsd
rename to core/src/test/resources/flex/messaging/io/amfx/amfx.xsd
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/amfx_tag/1a.xml b/core/src/test/resources/flex/messaging/io/amfx/amfx_tag/1a.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/amfx_tag/1a.xml
rename to core/src/test/resources/flex/messaging/io/amfx/amfx_tag/1a.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/amfx_tag/1b.xml b/core/src/test/resources/flex/messaging/io/amfx/amfx_tag/1b.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/amfx_tag/1b.xml
rename to core/src/test/resources/flex/messaging/io/amfx/amfx_tag/1b.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/amfx_tag/1c.xml b/core/src/test/resources/flex/messaging/io/amfx/amfx_tag/1c.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/amfx_tag/1c.xml
rename to core/src/test/resources/flex/messaging/io/amfx/amfx_tag/1c.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/array_tag/2a.xml b/core/src/test/resources/flex/messaging/io/amfx/array_tag/2a.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/array_tag/2a.xml
rename to core/src/test/resources/flex/messaging/io/amfx/array_tag/2a.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/array_tag/2b.xml b/core/src/test/resources/flex/messaging/io/amfx/array_tag/2b.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/array_tag/2b.xml
rename to core/src/test/resources/flex/messaging/io/amfx/array_tag/2b.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/array_tag/2c.xml b/core/src/test/resources/flex/messaging/io/amfx/array_tag/2c.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/array_tag/2c.xml
rename to core/src/test/resources/flex/messaging/io/amfx/array_tag/2c.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/array_tag/2d.xml b/core/src/test/resources/flex/messaging/io/amfx/array_tag/2d.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/array_tag/2d.xml
rename to core/src/test/resources/flex/messaging/io/amfx/array_tag/2d.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/array_tag/2e.xml b/core/src/test/resources/flex/messaging/io/amfx/array_tag/2e.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/array_tag/2e.xml
rename to core/src/test/resources/flex/messaging/io/amfx/array_tag/2e.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/array_tag/2f.xml b/core/src/test/resources/flex/messaging/io/amfx/array_tag/2f.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/array_tag/2f.xml
rename to core/src/test/resources/flex/messaging/io/amfx/array_tag/2f.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/array_tag/2g.xml b/core/src/test/resources/flex/messaging/io/amfx/array_tag/2g.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/array_tag/2g.xml
rename to core/src/test/resources/flex/messaging/io/amfx/array_tag/2g.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/array_tag/2h.xml b/core/src/test/resources/flex/messaging/io/amfx/array_tag/2h.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/array_tag/2h.xml
rename to core/src/test/resources/flex/messaging/io/amfx/array_tag/2h.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/array_tag/2i.xml b/core/src/test/resources/flex/messaging/io/amfx/array_tag/2i.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/array_tag/2i.xml
rename to core/src/test/resources/flex/messaging/io/amfx/array_tag/2i.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/array_tag/2j.xml b/core/src/test/resources/flex/messaging/io/amfx/array_tag/2j.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/array_tag/2j.xml
rename to core/src/test/resources/flex/messaging/io/amfx/array_tag/2j.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/array_tag/2k.xml b/core/src/test/resources/flex/messaging/io/amfx/array_tag/2k.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/array_tag/2k.xml
rename to core/src/test/resources/flex/messaging/io/amfx/array_tag/2k.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/array_tag/2l.xml b/core/src/test/resources/flex/messaging/io/amfx/array_tag/2l.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/array_tag/2l.xml
rename to core/src/test/resources/flex/messaging/io/amfx/array_tag/2l.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/body_tag/3a.xml b/core/src/test/resources/flex/messaging/io/amfx/body_tag/3a.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/body_tag/3a.xml
rename to core/src/test/resources/flex/messaging/io/amfx/body_tag/3a.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/body_tag/3b.xml b/core/src/test/resources/flex/messaging/io/amfx/body_tag/3b.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/body_tag/3b.xml
rename to core/src/test/resources/flex/messaging/io/amfx/body_tag/3b.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/body_tag/3c.xml b/core/src/test/resources/flex/messaging/io/amfx/body_tag/3c.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/body_tag/3c.xml
rename to core/src/test/resources/flex/messaging/io/amfx/body_tag/3c.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/body_tag/3d.xml b/core/src/test/resources/flex/messaging/io/amfx/body_tag/3d.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/body_tag/3d.xml
rename to core/src/test/resources/flex/messaging/io/amfx/body_tag/3d.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/bytes_tag/16a.xml b/core/src/test/resources/flex/messaging/io/amfx/bytes_tag/16a.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/bytes_tag/16a.xml
rename to core/src/test/resources/flex/messaging/io/amfx/bytes_tag/16a.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/date_tag/4a.xml b/core/src/test/resources/flex/messaging/io/amfx/date_tag/4a.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/date_tag/4a.xml
rename to core/src/test/resources/flex/messaging/io/amfx/date_tag/4a.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/date_tag/4b.xml b/core/src/test/resources/flex/messaging/io/amfx/date_tag/4b.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/date_tag/4b.xml
rename to core/src/test/resources/flex/messaging/io/amfx/date_tag/4b.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/date_tag/4c.xml b/core/src/test/resources/flex/messaging/io/amfx/date_tag/4c.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/date_tag/4c.xml
rename to core/src/test/resources/flex/messaging/io/amfx/date_tag/4c.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/date_tag/4d.xml b/core/src/test/resources/flex/messaging/io/amfx/date_tag/4d.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/date_tag/4d.xml
rename to core/src/test/resources/flex/messaging/io/amfx/date_tag/4d.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/date_tag/4e.xml b/core/src/test/resources/flex/messaging/io/amfx/date_tag/4e.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/date_tag/4e.xml
rename to core/src/test/resources/flex/messaging/io/amfx/date_tag/4e.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/date_tag/4f.xml b/core/src/test/resources/flex/messaging/io/amfx/date_tag/4f.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/date_tag/4f.xml
rename to core/src/test/resources/flex/messaging/io/amfx/date_tag/4f.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/date_tag/4g.xml b/core/src/test/resources/flex/messaging/io/amfx/date_tag/4g.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/date_tag/4g.xml
rename to core/src/test/resources/flex/messaging/io/amfx/date_tag/4g.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/double_tag/5a.xml b/core/src/test/resources/flex/messaging/io/amfx/double_tag/5a.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/double_tag/5a.xml
rename to core/src/test/resources/flex/messaging/io/amfx/double_tag/5a.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/double_tag/5b.xml b/core/src/test/resources/flex/messaging/io/amfx/double_tag/5b.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/double_tag/5b.xml
rename to core/src/test/resources/flex/messaging/io/amfx/double_tag/5b.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/double_tag/5c.xml b/core/src/test/resources/flex/messaging/io/amfx/double_tag/5c.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/double_tag/5c.xml
rename to core/src/test/resources/flex/messaging/io/amfx/double_tag/5c.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/double_tag/5d.xml b/core/src/test/resources/flex/messaging/io/amfx/double_tag/5d.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/double_tag/5d.xml
rename to core/src/test/resources/flex/messaging/io/amfx/double_tag/5d.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/double_tag/5e.xml b/core/src/test/resources/flex/messaging/io/amfx/double_tag/5e.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/double_tag/5e.xml
rename to core/src/test/resources/flex/messaging/io/amfx/double_tag/5e.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/double_tag/5f.xml b/core/src/test/resources/flex/messaging/io/amfx/double_tag/5f.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/double_tag/5f.xml
rename to core/src/test/resources/flex/messaging/io/amfx/double_tag/5f.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/double_tag/5g.xml b/core/src/test/resources/flex/messaging/io/amfx/double_tag/5g.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/double_tag/5g.xml
rename to core/src/test/resources/flex/messaging/io/amfx/double_tag/5g.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/double_tag/5h.xml b/core/src/test/resources/flex/messaging/io/amfx/double_tag/5h.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/double_tag/5h.xml
rename to core/src/test/resources/flex/messaging/io/amfx/double_tag/5h.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/false_tag/6a.xml b/core/src/test/resources/flex/messaging/io/amfx/false_tag/6a.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/false_tag/6a.xml
rename to core/src/test/resources/flex/messaging/io/amfx/false_tag/6a.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/false_tag/6b.xml b/core/src/test/resources/flex/messaging/io/amfx/false_tag/6b.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/false_tag/6b.xml
rename to core/src/test/resources/flex/messaging/io/amfx/false_tag/6b.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/false_tag/6c.xml b/core/src/test/resources/flex/messaging/io/amfx/false_tag/6c.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/false_tag/6c.xml
rename to core/src/test/resources/flex/messaging/io/amfx/false_tag/6c.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/false_tag/6d.xml b/core/src/test/resources/flex/messaging/io/amfx/false_tag/6d.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/false_tag/6d.xml
rename to core/src/test/resources/flex/messaging/io/amfx/false_tag/6d.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/header_tag/7a.xml b/core/src/test/resources/flex/messaging/io/amfx/header_tag/7a.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/header_tag/7a.xml
rename to core/src/test/resources/flex/messaging/io/amfx/header_tag/7a.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/header_tag/7b.xml b/core/src/test/resources/flex/messaging/io/amfx/header_tag/7b.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/header_tag/7b.xml
rename to core/src/test/resources/flex/messaging/io/amfx/header_tag/7b.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/header_tag/7c.xml b/core/src/test/resources/flex/messaging/io/amfx/header_tag/7c.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/header_tag/7c.xml
rename to core/src/test/resources/flex/messaging/io/amfx/header_tag/7c.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/header_tag/7d.xml b/core/src/test/resources/flex/messaging/io/amfx/header_tag/7d.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/header_tag/7d.xml
rename to core/src/test/resources/flex/messaging/io/amfx/header_tag/7d.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/int_tag/8a.xml b/core/src/test/resources/flex/messaging/io/amfx/int_tag/8a.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/int_tag/8a.xml
rename to core/src/test/resources/flex/messaging/io/amfx/int_tag/8a.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/int_tag/8b.xml b/core/src/test/resources/flex/messaging/io/amfx/int_tag/8b.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/int_tag/8b.xml
rename to core/src/test/resources/flex/messaging/io/amfx/int_tag/8b.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/int_tag/8c.xml b/core/src/test/resources/flex/messaging/io/amfx/int_tag/8c.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/int_tag/8c.xml
rename to core/src/test/resources/flex/messaging/io/amfx/int_tag/8c.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/int_tag/8d.xml b/core/src/test/resources/flex/messaging/io/amfx/int_tag/8d.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/int_tag/8d.xml
rename to core/src/test/resources/flex/messaging/io/amfx/int_tag/8d.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/int_tag/8e.xml b/core/src/test/resources/flex/messaging/io/amfx/int_tag/8e.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/int_tag/8e.xml
rename to core/src/test/resources/flex/messaging/io/amfx/int_tag/8e.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/int_tag/8f.xml b/core/src/test/resources/flex/messaging/io/amfx/int_tag/8f.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/int_tag/8f.xml
rename to core/src/test/resources/flex/messaging/io/amfx/int_tag/8f.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/int_tag/8g.xml b/core/src/test/resources/flex/messaging/io/amfx/int_tag/8g.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/int_tag/8g.xml
rename to core/src/test/resources/flex/messaging/io/amfx/int_tag/8g.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/null_tag/9a.xml b/core/src/test/resources/flex/messaging/io/amfx/null_tag/9a.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/null_tag/9a.xml
rename to core/src/test/resources/flex/messaging/io/amfx/null_tag/9a.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/null_tag/9b.xml b/core/src/test/resources/flex/messaging/io/amfx/null_tag/9b.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/null_tag/9b.xml
rename to core/src/test/resources/flex/messaging/io/amfx/null_tag/9b.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/null_tag/9c.xml b/core/src/test/resources/flex/messaging/io/amfx/null_tag/9c.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/null_tag/9c.xml
rename to core/src/test/resources/flex/messaging/io/amfx/null_tag/9c.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/null_tag/9d.xml b/core/src/test/resources/flex/messaging/io/amfx/null_tag/9d.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/null_tag/9d.xml
rename to core/src/test/resources/flex/messaging/io/amfx/null_tag/9d.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/object_tag/10a.xml b/core/src/test/resources/flex/messaging/io/amfx/object_tag/10a.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/object_tag/10a.xml
rename to core/src/test/resources/flex/messaging/io/amfx/object_tag/10a.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/object_tag/10b.xml b/core/src/test/resources/flex/messaging/io/amfx/object_tag/10b.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/object_tag/10b.xml
rename to core/src/test/resources/flex/messaging/io/amfx/object_tag/10b.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/object_tag/10c.xml b/core/src/test/resources/flex/messaging/io/amfx/object_tag/10c.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/object_tag/10c.xml
rename to core/src/test/resources/flex/messaging/io/amfx/object_tag/10c.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/object_tag/10d.xml b/core/src/test/resources/flex/messaging/io/amfx/object_tag/10d.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/object_tag/10d.xml
rename to core/src/test/resources/flex/messaging/io/amfx/object_tag/10d.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/string_tag/11a.xml b/core/src/test/resources/flex/messaging/io/amfx/string_tag/11a.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/string_tag/11a.xml
rename to core/src/test/resources/flex/messaging/io/amfx/string_tag/11a.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/string_tag/11b.xml b/core/src/test/resources/flex/messaging/io/amfx/string_tag/11b.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/string_tag/11b.xml
rename to core/src/test/resources/flex/messaging/io/amfx/string_tag/11b.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/string_tag/11c.xml b/core/src/test/resources/flex/messaging/io/amfx/string_tag/11c.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/string_tag/11c.xml
rename to core/src/test/resources/flex/messaging/io/amfx/string_tag/11c.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/string_tag/11d.xml b/core/src/test/resources/flex/messaging/io/amfx/string_tag/11d.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/string_tag/11d.xml
rename to core/src/test/resources/flex/messaging/io/amfx/string_tag/11d.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/string_tag/11e.xml b/core/src/test/resources/flex/messaging/io/amfx/string_tag/11e.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/string_tag/11e.xml
rename to core/src/test/resources/flex/messaging/io/amfx/string_tag/11e.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/string_tag/11f.xml b/core/src/test/resources/flex/messaging/io/amfx/string_tag/11f.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/string_tag/11f.xml
rename to core/src/test/resources/flex/messaging/io/amfx/string_tag/11f.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/string_tag/11g.xml b/core/src/test/resources/flex/messaging/io/amfx/string_tag/11g.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/string_tag/11g.xml
rename to core/src/test/resources/flex/messaging/io/amfx/string_tag/11g.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/string_tag/11h.xml b/core/src/test/resources/flex/messaging/io/amfx/string_tag/11h.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/string_tag/11h.xml
rename to core/src/test/resources/flex/messaging/io/amfx/string_tag/11h.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/string_tag/11i.xml b/core/src/test/resources/flex/messaging/io/amfx/string_tag/11i.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/string_tag/11i.xml
rename to core/src/test/resources/flex/messaging/io/amfx/string_tag/11i.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/string_tag/11j.xml b/core/src/test/resources/flex/messaging/io/amfx/string_tag/11j.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/string_tag/11j.xml
rename to core/src/test/resources/flex/messaging/io/amfx/string_tag/11j.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/traits_tag/12a.xml b/core/src/test/resources/flex/messaging/io/amfx/traits_tag/12a.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/traits_tag/12a.xml
rename to core/src/test/resources/flex/messaging/io/amfx/traits_tag/12a.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/traits_tag/12b.xml b/core/src/test/resources/flex/messaging/io/amfx/traits_tag/12b.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/traits_tag/12b.xml
rename to core/src/test/resources/flex/messaging/io/amfx/traits_tag/12b.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/true_tag/13a.xml b/core/src/test/resources/flex/messaging/io/amfx/true_tag/13a.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/true_tag/13a.xml
rename to core/src/test/resources/flex/messaging/io/amfx/true_tag/13a.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/true_tag/13b.xml b/core/src/test/resources/flex/messaging/io/amfx/true_tag/13b.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/true_tag/13b.xml
rename to core/src/test/resources/flex/messaging/io/amfx/true_tag/13b.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/true_tag/13c.xml b/core/src/test/resources/flex/messaging/io/amfx/true_tag/13c.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/true_tag/13c.xml
rename to core/src/test/resources/flex/messaging/io/amfx/true_tag/13c.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/true_tag/13d.xml b/core/src/test/resources/flex/messaging/io/amfx/true_tag/13d.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/true_tag/13d.xml
rename to core/src/test/resources/flex/messaging/io/amfx/true_tag/13d.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/undefined_tag/14a.xml b/core/src/test/resources/flex/messaging/io/amfx/undefined_tag/14a.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/undefined_tag/14a.xml
rename to core/src/test/resources/flex/messaging/io/amfx/undefined_tag/14a.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/undefined_tag/14b.xml b/core/src/test/resources/flex/messaging/io/amfx/undefined_tag/14b.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/undefined_tag/14b.xml
rename to core/src/test/resources/flex/messaging/io/amfx/undefined_tag/14b.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/undefined_tag/14c.xml b/core/src/test/resources/flex/messaging/io/amfx/undefined_tag/14c.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/undefined_tag/14c.xml
rename to core/src/test/resources/flex/messaging/io/amfx/undefined_tag/14c.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/undefined_tag/14d.xml b/core/src/test/resources/flex/messaging/io/amfx/undefined_tag/14d.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/undefined_tag/14d.xml
rename to core/src/test/resources/flex/messaging/io/amfx/undefined_tag/14d.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/xml_tag/15a.xml b/core/src/test/resources/flex/messaging/io/amfx/xml_tag/15a.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/xml_tag/15a.xml
rename to core/src/test/resources/flex/messaging/io/amfx/xml_tag/15a.xml
diff --git a/testsuite/src/test/resources/flex/messaging/io/amfx/xml_tag/15b.xml b/core/src/test/resources/flex/messaging/io/amfx/xml_tag/15b.xml
similarity index 100%
rename from testsuite/src/test/resources/flex/messaging/io/amfx/xml_tag/15b.xml
rename to core/src/test/resources/flex/messaging/io/amfx/xml_tag/15b.xml
diff --git a/opt/pom.xml b/opt/pom.xml
index 91b7378..f247386 100755
--- a/opt/pom.xml
+++ b/opt/pom.xml
@@ -16,53 +16,51 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.flex.blazeds</groupId>
- <artifactId>blazeds</artifactId>
- <version>4.7.3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
+ <parent>
+ <groupId>org.apache.flex.blazeds</groupId>
+ <artifactId>blazeds</artifactId>
+ <version>4.7.3-SNAPSHOT</version>
+ </parent>
- <artifactId>flex-messaging-opt</artifactId>
- <packaging>pom</packaging>
+ <artifactId>flex-messaging-opt</artifactId>
+ <packaging>pom</packaging>
- <modules>
- <module>tomcat</module>
- <!-- TODO: Commented out these project as they have third-party dependencies that might be problematic. -->
- <!--module>websphere</module-->
- <!--module>weblogic</module-->
- <!--module>oracle</module-->
- <module>blazeds-spring-boot-starter</module>
- </modules>
+ <modules>
+ <module>tomcat</module>
+ <!-- TODO: Commented out these project as they have third-party dependencies that might be problematic. -->
+ <!--module>websphere</module-->
+ <!--module>weblogic</module-->
+ <!--module>oracle</module-->
+ <module>blazeds-spring-boot-starter</module>
+ </modules>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.blazeds</groupId>
- <artifactId>flex-messaging-core</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.blazeds</groupId>
+ <artifactId>flex-messaging-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.0.1</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
diff --git a/opt/tomcat/pom.xml b/opt/tomcat/pom.xml
index 78b33d6..86b6512 100644
--- a/opt/tomcat/pom.xml
+++ b/opt/tomcat/pom.xml
@@ -16,23 +16,24 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.flex.blazeds</groupId>
- <artifactId>flex-messaging-opt</artifactId>
- <version>4.7.3-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.flex.blazeds</groupId>
+ <artifactId>flex-messaging-opt</artifactId>
+ <version>4.7.3-SNAPSHOT</version>
+ </parent>
- <artifactId>flex-messaging-opt-tomcat</artifactId>
- <packaging>pom</packaging>
+ <artifactId>flex-messaging-opt-tomcat</artifactId>
+ <packaging>pom</packaging>
- <modules>
- <module>tomcat-base</module>
- <module>tomcat-4</module>
- <module>tomcat-6</module>
- <module>tomcat-7</module>
- </modules>
+ <modules>
+ <module>tomcat-base</module>
+ <module>tomcat-4</module>
+ <module>tomcat-6</module>
+ <module>tomcat-7</module>
+ </modules>
</project>
diff --git a/opt/tomcat/tomcat-4/pom.xml b/opt/tomcat/tomcat-4/pom.xml
index df46834..3e28cba 100644
--- a/opt/tomcat/tomcat-4/pom.xml
+++ b/opt/tomcat/tomcat-4/pom.xml
@@ -16,31 +16,32 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.flex.blazeds</groupId>
- <artifactId>flex-messaging-opt-tomcat</artifactId>
- <version>4.7.3-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.flex.blazeds</groupId>
+ <artifactId>flex-messaging-opt-tomcat</artifactId>
+ <version>4.7.3-SNAPSHOT</version>
+ </parent>
- <artifactId>flex-messaging-opt-tomcat-4</artifactId>
+ <artifactId>flex-messaging-opt-tomcat-4</artifactId>
- <dependencies>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>catalina</artifactId>
- <version>4.0.6</version>
- <scope>provided</scope>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ <version>4.0.6</version>
+ <scope>provided</scope>
+ </dependency>
- <dependency>
- <groupId>org.apache.flex.blazeds</groupId>
- <artifactId>flex-messaging-opt-tomcat-base</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.apache.flex.blazeds</groupId>
+ <artifactId>flex-messaging-opt-tomcat-base</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
</project>
diff --git a/opt/tomcat/tomcat-6/pom.xml b/opt/tomcat/tomcat-6/pom.xml
index c614e6a..baabed5 100644
--- a/opt/tomcat/tomcat-6/pom.xml
+++ b/opt/tomcat/tomcat-6/pom.xml
@@ -16,35 +16,36 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.flex.blazeds</groupId>
- <artifactId>flex-messaging-opt-tomcat</artifactId>
- <version>4.7.3-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.flex.blazeds</groupId>
+ <artifactId>flex-messaging-opt-tomcat</artifactId>
+ <version>4.7.3-SNAPSHOT</version>
+ </parent>
- <artifactId>flex-messaging-opt-tomcat-6</artifactId>
+ <artifactId>flex-messaging-opt-tomcat-6</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>servlet-api</artifactId>
- <version>6.0.26</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>catalina</artifactId>
- <version>6.0.26</version>
- <scope>provided</scope>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>6.0.26</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ <version>6.0.26</version>
+ <scope>provided</scope>
+ </dependency>
- <dependency>
- <groupId>org.apache.flex.blazeds</groupId>
- <artifactId>flex-messaging-opt-tomcat-base</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.apache.flex.blazeds</groupId>
+ <artifactId>flex-messaging-opt-tomcat-base</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
</project>
diff --git a/opt/tomcat/tomcat-7/pom.xml b/opt/tomcat/tomcat-7/pom.xml
index 82d0ab8..c68292e 100644
--- a/opt/tomcat/tomcat-7/pom.xml
+++ b/opt/tomcat/tomcat-7/pom.xml
@@ -16,30 +16,31 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.flex.blazeds</groupId>
- <artifactId>flex-messaging-opt-tomcat</artifactId>
- <version>4.7.3-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.flex.blazeds</groupId>
+ <artifactId>flex-messaging-opt-tomcat</artifactId>
+ <version>4.7.3-SNAPSHOT</version>
+ </parent>
- <artifactId>flex-messaging-opt-tomcat-7</artifactId>
+ <artifactId>flex-messaging-opt-tomcat-7</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina</artifactId>
- <version>7.0.8</version>
- <scope>provided</scope>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ <version>7.0.8</version>
+ <scope>provided</scope>
+ </dependency>
- <dependency>
- <groupId>org.apache.flex.blazeds</groupId>
- <artifactId>flex-messaging-opt-tomcat-base</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.apache.flex.blazeds</groupId>
+ <artifactId>flex-messaging-opt-tomcat-base</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
</project>
diff --git a/opt/tomcat/tomcat-base/pom.xml b/opt/tomcat/tomcat-base/pom.xml
index 96b6337..f80ee2a 100644
--- a/opt/tomcat/tomcat-base/pom.xml
+++ b/opt/tomcat/tomcat-base/pom.xml
@@ -16,15 +16,16 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.flex.blazeds</groupId>
- <artifactId>flex-messaging-opt-tomcat</artifactId>
- <version>4.7.3-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.flex.blazeds</groupId>
+ <artifactId>flex-messaging-opt-tomcat</artifactId>
+ <version>4.7.3-SNAPSHOT</version>
+ </parent>
- <artifactId>flex-messaging-opt-tomcat-base</artifactId>
+ <artifactId>flex-messaging-opt-tomcat-base</artifactId>
</project>
diff --git a/pom.xml b/pom.xml
index 1e15108..9c4ea1a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -17,297 +17,346 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>16</version>
- </parent>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>16</version>
+ </parent>
- <groupId>org.apache.flex.blazeds</groupId>
- <artifactId>blazeds</artifactId>
- <version>4.7.3-SNAPSHOT</version>
- <packaging>pom</packaging>
+ <groupId>org.apache.flex.blazeds</groupId>
+ <artifactId>blazeds</artifactId>
+ <version>4.7.3-SNAPSHOT</version>
+ <packaging>pom</packaging>
- <name>Apache Flex - BlazeDS</name>
+ <name>Apache Flex - BlazeDS</name>
- <properties>
- <!-- URL of the ASF SonarQube server -->
- <sonar.host.url>https://builds.apache.org/analysis</sonar.host.url>
- <!-- Tell sonar where the coverage reports are located -->
- <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco-ut.exec</sonar.jacoco.reportPath>
- <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>
- <!-- Exclude all generated code -->
- <sonar.exclusions>file:**/generated-sources/**</sonar.exclusions>
- </properties>
+ <properties>
+ <!-- URL of the ASF SonarQube server -->
+ <sonar.host.url>https://builds.apache.org/analysis</sonar.host.url>
+ <!-- Tell sonar where the coverage reports are located -->
+ <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco-ut.exec</sonar.jacoco.reportPath>
+ <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>
+ <!-- Exclude all generated code -->
+ <sonar.exclusions>file:**/generated-sources/**</sonar.exclusions>
+ </properties>
- <mailingLists>
- <mailingList>
- <name>Apache Flex Dev List</name>
- <subscribe>dev-subscribe@flex.apache.org</subscribe>
- <unsubscribe>dev-unsubscribe@flex.apache.org</unsubscribe>
- <post>dev@flex.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/flex-dev/</archive>
- </mailingList>
- <mailingList>
- <name>Apache Flex User List</name>
- <subscribe>users-subscribe@flex.apache.org</subscribe>
- <unsubscribe>users-unsubscribe@flex.apache.org</unsubscribe>
- <post>users@flex.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/flex-users/</archive>
- </mailingList>
- </mailingLists>
+ <mailingLists>
+ <mailingList>
+ <name>Apache Flex Dev List</name>
+ <subscribe>dev-subscribe@flex.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@flex.apache.org</unsubscribe>
+ <post>dev@flex.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/flex-dev/</archive>
+ </mailingList>
+ <mailingList>
+ <name>Apache Flex User List</name>
+ <subscribe>users-subscribe@flex.apache.org</subscribe>
+ <unsubscribe>users-unsubscribe@flex.apache.org</unsubscribe>
+ <post>users@flex.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/flex-users/</archive>
+ </mailingList>
+ </mailingLists>
- <scm>
- <connection>scm:git:https://git-wip-us.apache.org/repos/asf/flex-blazeds.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/flex-blazeds.git</developerConnection>
- <url>https://git-wip-us.apache.org/repos/asf/flex-blazeds.git</url>
- <tag>HEAD</tag>
+ <scm>
+ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/flex-blazeds.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/flex-blazeds.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf/flex-blazeds.git</url>
+ <tag>HEAD</tag>
</scm>
- <modules>
- <module>common</module>
- <module>core</module>
- <module>proxy</module>
- <module>remoting</module>
- <module>opt</module>
- <module>testsuite</module>
- </modules>
+ <modules>
+ <module>common</module>
+ <module>core</module>
+ <module>proxy</module>
+ <module>remoting</module>
+ <module>opt</module>
+ </modules>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>0.7.6.201602180812</version>
- <executions>
- <!--
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.7.6.201602180812</version>
+ <executions>
+ <!--
Prepares the property pointing to the JaCoCo runtime agent which
is passed as VM argument when Maven the Surefire plugin is executed.
-->
- <execution>
- <id>pre-unit-test</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- <configuration>
- <!-- Sets the path to the file which contains the execution data. -->
- <destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile>
- <!--
+ <execution>
+ <id>pre-unit-test</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <!-- Sets the path to the file which contains the execution data. -->
+ <destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile>
+ <!--
Sets the name of the property containing the settings
for JaCoCo runtime agent.
-->
- <propertyName>surefireArgLine</propertyName>
- </configuration>
- </execution>
- <!--
+ <propertyName>surefireArgLine</propertyName>
+ </configuration>
+ </execution>
+ <!--
Ensures that the code coverage report for unit tests is created after
unit tests have been run.
-->
- <execution>
- <id>post-unit-test</id>
- <phase>test</phase>
- <goals>
- <goal>report</goal>
- </goals>
- <configuration>
- <!-- Sets the path to the file which contains the execution data. -->
- <dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile>
- <!-- Sets the output directory for the code coverage report. -->
- <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
- </configuration>
- </execution>
- <!--
+ <execution>
+ <id>post-unit-test</id>
+ <phase>test</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ <configuration>
+ <!-- Sets the path to the file which contains the execution data. -->
+ <dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile>
+ <!-- Sets the output directory for the code coverage report. -->
+ <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+ </configuration>
+ </execution>
+ <!--
Prepares the property pointing to the JaCoCo runtime agent which
is passed as VM argument when Maven the Failsafe plugin is executed.
-->
- <execution>
- <id>pre-integration-test</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- <configuration>
- <!-- Sets the path to the file which contains the execution data. -->
- <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
- <!--
+ <execution>
+ <id>pre-integration-test</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <!-- Sets the path to the file which contains the execution data. -->
+ <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
+ <!--
Sets the name of the property containing the settings
for JaCoCo runtime agent.
-->
- <propertyName>failsafeArgLine</propertyName>
- </configuration>
- </execution>
- <!--
+ <propertyName>failsafeArgLine</propertyName>
+ </configuration>
+ </execution>
+ <!--
Ensures that the code coverage report for integration tests after
integration tests have been run.
-->
- <execution>
- <id>post-integration-test</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>report</goal>
- </goals>
- <configuration>
- <!-- Sets the path to the file which contains the execution data. -->
- <dataFile>${project.build.directory}/coverage-reports/jacoco-it.exec</dataFile>
- <!-- Sets the output directory for the code coverage report. -->
- <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <execution>
+ <id>post-integration-test</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ <configuration>
+ <!-- Sets the path to the file which contains the execution data. -->
+ <dataFile>${project.build.directory}/coverage-reports/jacoco-it.exec</dataFile>
+ <!-- Sets the output directory for the code coverage report. -->
+ <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*Tests.java</include>
- <include>**/*Test.java</include>
- </includes>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*Tests.java</include>
+ <include>**/*Test.java</include>
+ </includes>
+ </configuration>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <!-- FIXME: Disabled the integrationtests for now -->
+ <!--plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin-->
- <!-- Turned off till the JavaDoc tags are all correctly set -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
+ <!-- Turned off till the JavaDoc tags are all correctly set -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
- <!-- Plugin to detect problems with JDK incompatabilities -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.15</version>
- <executions>
- <execution>
- <id>check-jdk-1.6</id>
- <phase>test</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java16</artifactId>
- <version>1.1</version>
- </signature>
- </configuration>
- </plugin>
+ <!-- Plugin to detect problems with JDK incompatabilities -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>animal-sniffer-maven-plugin</artifactId>
+ <version>1.15</version>
+ <executions>
+ <execution>
+ <id>check-jdk-1.6</id>
+ <phase>test</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <signature>
+ <groupId>org.codehaus.mojo.signature</groupId>
+ <artifactId>java16</artifactId>
+ <version>1.1</version>
+ </signature>
+ </configuration>
+ </plugin>
- <plugin>
- <groupId>org.sonarsource.scanner.maven</groupId>
- <artifactId>sonar-maven-plugin</artifactId>
- <version>3.0.2</version>
- </plugin>
- </plugins>
- </build>
+ <plugin>
+ <groupId>org.sonarsource.scanner.maven</groupId>
+ <artifactId>sonar-maven-plugin</artifactId>
+ <version>3.0.2</version>
+ </plugin>
+ </plugins>
+ </build>
- <reporting>
- <plugins>
+ <reporting>
+ <plugins>
- <!-- Generates a changelog report from GIT commits -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changelog-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <!-- Automatically link Jira issues -->
- <issueLinkUrl>https://issues.apache.org/jira/browse/%ISSUE%</issueLinkUrl>
- </configuration>
- </plugin>
+ <!-- Generates a changelog report from GIT commits -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changelog-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <!-- Automatically link Jira issues -->
+ <issueLinkUrl>https://issues.apache.org/jira/browse/%ISSUE%</issueLinkUrl>
+ </configuration>
+ </plugin>
- <!-- Generates a report with the details of the unit- and integrationtests -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.19.1</version>
- </plugin>
+ <!-- Generates a report with the details of the unit- and integrationtests -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.19.1</version>
+ </plugin>
- <!-- Generates a report with the test coverages -->
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>0.7.6.201602180812</version>
- </plugin>
+ <!-- Generates a report with the test coverages -->
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.7.6.201602180812</version>
+ </plugin>
- <!-- Generates a report with the SonarQube analysis reports -->
- <plugin>
- <groupId>org.codehaus.sonar-plugins</groupId>
- <artifactId>maven-report</artifactId>
- <version>0.1</version>
- </plugin>
+ <!-- Generates a report with the SonarQube analysis reports -->
+ <plugin>
+ <groupId>org.codehaus.sonar-plugins</groupId>
+ <artifactId>maven-report</artifactId>
+ <version>0.1</version>
+ </plugin>
- <!-- Generate the JavaDoc API documentation -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.4</version>
- </plugin>
- </plugins>
- </reporting>
+ <!-- Generate the JavaDoc API documentation -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.10.4</version>
+ </plugin>
+ </plugins>
+ </reporting>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.6.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.0.1</version>
+ </dependency>
- <!-- When building on the apache ci server, we want to get some source-release archives -->
- <profiles>
- <profile>
- <id>flex-ci-build</id>
+ <!-- Optionals -->
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.5.1</version>
- <executions>
- <execution>
- <id>assemble-sources-releases</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/assemble-zip.xml</descriptor>
- <descriptor>src/assembly/assemble-gz.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ <version>5.7.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ <version>2.9.0.GA</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.jms</groupId>
+ <artifactId>javax.jms-api</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+
+ <!-- Testing -->
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <!-- When building on the apache ci server, we want to get some source-release archives -->
+ <profiles>
+ <profile>
+ <id>flex-ci-build</id>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.5.1</version>
+ <executions>
+ <execution>
+ <id>assemble-sources-releases</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/assemble-zip.xml</descriptor>
+ <descriptor>src/assembly/assemble-gz.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index d0d4382..c50eb96 100755
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -16,48 +16,41 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.flex.blazeds</groupId>
- <artifactId>blazeds</artifactId>
- <version>4.7.3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
+ <parent>
+ <groupId>org.apache.flex.blazeds</groupId>
+ <artifactId>blazeds</artifactId>
+ <version>4.7.3-SNAPSHOT</version>
+ </parent>
- <artifactId>flex-messaging-proxy</artifactId>
+ <artifactId>flex-messaging-proxy</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.blazeds</groupId>
- <artifactId>flex-messaging-core</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.blazeds</groupId>
+ <artifactId>flex-messaging-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.0.1</version>
- </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <sourceDirectory>src</sourceDirectory>
- </build>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
diff --git a/proxy/src/flex/management/runtime/messaging/services/HTTPProxyServiceControl.java b/proxy/src/main/java/flex/management/runtime/messaging/services/HTTPProxyServiceControl.java
similarity index 100%
rename from proxy/src/flex/management/runtime/messaging/services/HTTPProxyServiceControl.java
rename to proxy/src/main/java/flex/management/runtime/messaging/services/HTTPProxyServiceControl.java
diff --git a/proxy/src/flex/management/runtime/messaging/services/HTTPProxyServiceControlMBean.java b/proxy/src/main/java/flex/management/runtime/messaging/services/HTTPProxyServiceControlMBean.java
similarity index 100%
rename from proxy/src/flex/management/runtime/messaging/services/HTTPProxyServiceControlMBean.java
rename to proxy/src/main/java/flex/management/runtime/messaging/services/HTTPProxyServiceControlMBean.java
diff --git a/proxy/src/flex/management/runtime/messaging/services/http/HTTPProxyAdapterControl.java b/proxy/src/main/java/flex/management/runtime/messaging/services/http/HTTPProxyAdapterControl.java
similarity index 100%
rename from proxy/src/flex/management/runtime/messaging/services/http/HTTPProxyAdapterControl.java
rename to proxy/src/main/java/flex/management/runtime/messaging/services/http/HTTPProxyAdapterControl.java
diff --git a/proxy/src/flex/management/runtime/messaging/services/http/HTTPProxyAdapterControlMBean.java b/proxy/src/main/java/flex/management/runtime/messaging/services/http/HTTPProxyAdapterControlMBean.java
similarity index 100%
rename from proxy/src/flex/management/runtime/messaging/services/http/HTTPProxyAdapterControlMBean.java
rename to proxy/src/main/java/flex/management/runtime/messaging/services/http/HTTPProxyAdapterControlMBean.java
diff --git a/proxy/src/flex/management/runtime/messaging/services/http/HTTPProxyDestinationControl.java b/proxy/src/main/java/flex/management/runtime/messaging/services/http/HTTPProxyDestinationControl.java
similarity index 100%
rename from proxy/src/flex/management/runtime/messaging/services/http/HTTPProxyDestinationControl.java
rename to proxy/src/main/java/flex/management/runtime/messaging/services/http/HTTPProxyDestinationControl.java
diff --git a/proxy/src/flex/management/runtime/messaging/services/http/HTTPProxyDestinationControlMBean.java b/proxy/src/main/java/flex/management/runtime/messaging/services/http/HTTPProxyDestinationControlMBean.java
similarity index 100%
rename from proxy/src/flex/management/runtime/messaging/services/http/HTTPProxyDestinationControlMBean.java
rename to proxy/src/main/java/flex/management/runtime/messaging/services/http/HTTPProxyDestinationControlMBean.java
diff --git a/proxy/src/flex/management/runtime/messaging/services/http/SOAPProxyAdapterControl.java b/proxy/src/main/java/flex/management/runtime/messaging/services/http/SOAPProxyAdapterControl.java
similarity index 100%
rename from proxy/src/flex/management/runtime/messaging/services/http/SOAPProxyAdapterControl.java
rename to proxy/src/main/java/flex/management/runtime/messaging/services/http/SOAPProxyAdapterControl.java
diff --git a/proxy/src/flex/management/runtime/messaging/services/http/SOAPProxyAdapterControlMBean.java b/proxy/src/main/java/flex/management/runtime/messaging/services/http/SOAPProxyAdapterControlMBean.java
similarity index 100%
rename from proxy/src/flex/management/runtime/messaging/services/http/SOAPProxyAdapterControlMBean.java
rename to proxy/src/main/java/flex/management/runtime/messaging/services/http/SOAPProxyAdapterControlMBean.java
diff --git a/proxy/src/flex/management/runtime/messaging/services/http/package-info.java b/proxy/src/main/java/flex/management/runtime/messaging/services/http/package-info.java
similarity index 100%
rename from proxy/src/flex/management/runtime/messaging/services/http/package-info.java
rename to proxy/src/main/java/flex/management/runtime/messaging/services/http/package-info.java
diff --git a/proxy/src/flex/messaging/services/HTTPProxyService.java b/proxy/src/main/java/flex/messaging/services/HTTPProxyService.java
similarity index 100%
rename from proxy/src/flex/messaging/services/HTTPProxyService.java
rename to proxy/src/main/java/flex/messaging/services/HTTPProxyService.java
diff --git a/proxy/src/flex/messaging/services/http/ExternalProxySettings.java b/proxy/src/main/java/flex/messaging/services/http/ExternalProxySettings.java
similarity index 100%
rename from proxy/src/flex/messaging/services/http/ExternalProxySettings.java
rename to proxy/src/main/java/flex/messaging/services/http/ExternalProxySettings.java
diff --git a/proxy/src/flex/messaging/services/http/HTTPConnectionManagerSettings.java b/proxy/src/main/java/flex/messaging/services/http/HTTPConnectionManagerSettings.java
similarity index 100%
rename from proxy/src/flex/messaging/services/http/HTTPConnectionManagerSettings.java
rename to proxy/src/main/java/flex/messaging/services/http/HTTPConnectionManagerSettings.java
diff --git a/proxy/src/flex/messaging/services/http/HTTPProxyAdapter.java b/proxy/src/main/java/flex/messaging/services/http/HTTPProxyAdapter.java
similarity index 100%
rename from proxy/src/flex/messaging/services/http/HTTPProxyAdapter.java
rename to proxy/src/main/java/flex/messaging/services/http/HTTPProxyAdapter.java
diff --git a/proxy/src/flex/messaging/services/http/HTTPProxyDestination.java b/proxy/src/main/java/flex/messaging/services/http/HTTPProxyDestination.java
similarity index 100%
rename from proxy/src/flex/messaging/services/http/HTTPProxyDestination.java
rename to proxy/src/main/java/flex/messaging/services/http/HTTPProxyDestination.java
diff --git a/proxy/src/flex/messaging/services/http/HostConfigurationSettings.java b/proxy/src/main/java/flex/messaging/services/http/HostConfigurationSettings.java
similarity index 100%
rename from proxy/src/flex/messaging/services/http/HostConfigurationSettings.java
rename to proxy/src/main/java/flex/messaging/services/http/HostConfigurationSettings.java
diff --git a/proxy/src/flex/messaging/services/http/ProtocolFactory.java b/proxy/src/main/java/flex/messaging/services/http/ProtocolFactory.java
similarity index 100%
rename from proxy/src/flex/messaging/services/http/ProtocolFactory.java
rename to proxy/src/main/java/flex/messaging/services/http/ProtocolFactory.java
diff --git a/proxy/src/flex/messaging/services/http/SOAPProxyAdapter.java b/proxy/src/main/java/flex/messaging/services/http/SOAPProxyAdapter.java
similarity index 100%
rename from proxy/src/flex/messaging/services/http/SOAPProxyAdapter.java
rename to proxy/src/main/java/flex/messaging/services/http/SOAPProxyAdapter.java
diff --git a/proxy/src/flex/messaging/services/http/httpclient/EasySSLProtocolSocketFactory.java b/proxy/src/main/java/flex/messaging/services/http/httpclient/EasySSLProtocolSocketFactory.java
similarity index 100%
rename from proxy/src/flex/messaging/services/http/httpclient/EasySSLProtocolSocketFactory.java
rename to proxy/src/main/java/flex/messaging/services/http/httpclient/EasySSLProtocolSocketFactory.java
diff --git a/proxy/src/flex/messaging/services/http/httpclient/EasyX509TrustManager.java b/proxy/src/main/java/flex/messaging/services/http/httpclient/EasyX509TrustManager.java
similarity index 100%
rename from proxy/src/flex/messaging/services/http/httpclient/EasyX509TrustManager.java
rename to proxy/src/main/java/flex/messaging/services/http/httpclient/EasyX509TrustManager.java
diff --git a/proxy/src/flex/messaging/services/http/httpclient/FlexGetMethod.java b/proxy/src/main/java/flex/messaging/services/http/httpclient/FlexGetMethod.java
similarity index 100%
rename from proxy/src/flex/messaging/services/http/httpclient/FlexGetMethod.java
rename to proxy/src/main/java/flex/messaging/services/http/httpclient/FlexGetMethod.java
diff --git a/proxy/src/flex/messaging/services/http/httpclient/FlexPostMethod.java b/proxy/src/main/java/flex/messaging/services/http/httpclient/FlexPostMethod.java
similarity index 100%
rename from proxy/src/flex/messaging/services/http/httpclient/FlexPostMethod.java
rename to proxy/src/main/java/flex/messaging/services/http/httpclient/FlexPostMethod.java
diff --git a/proxy/src/flex/messaging/services/http/httpclient/package-info.java b/proxy/src/main/java/flex/messaging/services/http/httpclient/package-info.java
similarity index 100%
rename from proxy/src/flex/messaging/services/http/httpclient/package-info.java
rename to proxy/src/main/java/flex/messaging/services/http/httpclient/package-info.java
diff --git a/proxy/src/flex/messaging/services/http/package-info.java b/proxy/src/main/java/flex/messaging/services/http/package-info.java
similarity index 100%
rename from proxy/src/flex/messaging/services/http/package-info.java
rename to proxy/src/main/java/flex/messaging/services/http/package-info.java
diff --git a/proxy/src/flex/messaging/services/http/proxy/AccessFilter.java b/proxy/src/main/java/flex/messaging/services/http/proxy/AccessFilter.java
similarity index 100%
rename from proxy/src/flex/messaging/services/http/proxy/AccessFilter.java
rename to proxy/src/main/java/flex/messaging/services/http/proxy/AccessFilter.java
diff --git a/proxy/src/flex/messaging/services/http/proxy/CookieInfo.java b/proxy/src/main/java/flex/messaging/services/http/proxy/CookieInfo.java
similarity index 100%
rename from proxy/src/flex/messaging/services/http/proxy/CookieInfo.java
rename to proxy/src/main/java/flex/messaging/services/http/proxy/CookieInfo.java
diff --git a/proxy/src/flex/messaging/services/http/proxy/ErrorFilter.java b/proxy/src/main/java/flex/messaging/services/http/proxy/ErrorFilter.java
similarity index 100%
rename from proxy/src/flex/messaging/services/http/proxy/ErrorFilter.java
rename to proxy/src/main/java/flex/messaging/services/http/proxy/ErrorFilter.java
diff --git a/proxy/src/flex/messaging/services/http/proxy/ProxyConstants.java b/proxy/src/main/java/flex/messaging/services/http/proxy/ProxyConstants.java
similarity index 100%
rename from proxy/src/flex/messaging/services/http/proxy/ProxyConstants.java
rename to proxy/src/main/java/flex/messaging/services/http/proxy/ProxyConstants.java
diff --git a/proxy/src/flex/messaging/services/http/proxy/ProxyContext.java b/proxy/src/main/java/flex/messaging/services/http/proxy/ProxyContext.java
similarity index 100%
rename from proxy/src/flex/messaging/services/http/proxy/ProxyContext.java
rename to proxy/src/main/java/flex/messaging/services/http/proxy/ProxyContext.java
diff --git a/proxy/src/flex/messaging/services/http/proxy/ProxyContextFilter.java b/proxy/src/main/java/flex/messaging/services/http/proxy/ProxyContextFilter.java
similarity index 100%
rename from proxy/src/flex/messaging/services/http/proxy/ProxyContextFilter.java
rename to proxy/src/main/java/flex/messaging/services/http/proxy/ProxyContextFilter.java
diff --git a/proxy/src/flex/messaging/services/http/proxy/ProxyException.java b/proxy/src/main/java/flex/messaging/services/http/proxy/ProxyException.java
similarity index 100%
rename from proxy/src/flex/messaging/services/http/proxy/ProxyException.java
rename to proxy/src/main/java/flex/messaging/services/http/proxy/ProxyException.java
diff --git a/proxy/src/flex/messaging/services/http/proxy/ProxyFilter.java b/proxy/src/main/java/flex/messaging/services/http/proxy/ProxyFilter.java
similarity index 100%
rename from proxy/src/flex/messaging/services/http/proxy/ProxyFilter.java
rename to proxy/src/main/java/flex/messaging/services/http/proxy/ProxyFilter.java
diff --git a/proxy/src/flex/messaging/services/http/proxy/ProxyUtil.java b/proxy/src/main/java/flex/messaging/services/http/proxy/ProxyUtil.java
similarity index 100%
rename from proxy/src/flex/messaging/services/http/proxy/ProxyUtil.java
rename to proxy/src/main/java/flex/messaging/services/http/proxy/ProxyUtil.java
diff --git a/proxy/src/flex/messaging/services/http/proxy/RequestFilter.java b/proxy/src/main/java/flex/messaging/services/http/proxy/RequestFilter.java
similarity index 100%
rename from proxy/src/flex/messaging/services/http/proxy/RequestFilter.java
rename to proxy/src/main/java/flex/messaging/services/http/proxy/RequestFilter.java
diff --git a/proxy/src/flex/messaging/services/http/proxy/RequestUtil.java b/proxy/src/main/java/flex/messaging/services/http/proxy/RequestUtil.java
similarity index 100%
rename from proxy/src/flex/messaging/services/http/proxy/RequestUtil.java
rename to proxy/src/main/java/flex/messaging/services/http/proxy/RequestUtil.java
diff --git a/proxy/src/flex/messaging/services/http/proxy/ResponseFilter.java b/proxy/src/main/java/flex/messaging/services/http/proxy/ResponseFilter.java
similarity index 100%
rename from proxy/src/flex/messaging/services/http/proxy/ResponseFilter.java
rename to proxy/src/main/java/flex/messaging/services/http/proxy/ResponseFilter.java
diff --git a/proxy/src/flex/messaging/services/http/proxy/ResponseUtil.java b/proxy/src/main/java/flex/messaging/services/http/proxy/ResponseUtil.java
similarity index 100%
rename from proxy/src/flex/messaging/services/http/proxy/ResponseUtil.java
rename to proxy/src/main/java/flex/messaging/services/http/proxy/ResponseUtil.java
diff --git a/proxy/src/flex/messaging/services/http/proxy/SecurityFilter.java b/proxy/src/main/java/flex/messaging/services/http/proxy/SecurityFilter.java
similarity index 100%
rename from proxy/src/flex/messaging/services/http/proxy/SecurityFilter.java
rename to proxy/src/main/java/flex/messaging/services/http/proxy/SecurityFilter.java
diff --git a/proxy/src/flex/messaging/services/http/proxy/SharedProxyContext.java b/proxy/src/main/java/flex/messaging/services/http/proxy/SharedProxyContext.java
similarity index 100%
rename from proxy/src/flex/messaging/services/http/proxy/SharedProxyContext.java
rename to proxy/src/main/java/flex/messaging/services/http/proxy/SharedProxyContext.java
diff --git a/proxy/src/flex/messaging/services/http/proxy/Target.java b/proxy/src/main/java/flex/messaging/services/http/proxy/Target.java
similarity index 100%
rename from proxy/src/flex/messaging/services/http/proxy/Target.java
rename to proxy/src/main/java/flex/messaging/services/http/proxy/Target.java
diff --git a/proxy/src/flex/messaging/services/http/proxy/package-info.java b/proxy/src/main/java/flex/messaging/services/http/proxy/package-info.java
similarity index 100%
rename from proxy/src/flex/messaging/services/http/proxy/package-info.java
rename to proxy/src/main/java/flex/messaging/services/http/proxy/package-info.java
diff --git a/remoting/pom.xml b/remoting/pom.xml
index 2942041..245fd8c 100755
--- a/remoting/pom.xml
+++ b/remoting/pom.xml
@@ -16,35 +16,31 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.flex.blazeds</groupId>
- <artifactId>blazeds</artifactId>
- <version>4.7.3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
+ <parent>
+ <groupId>org.apache.flex.blazeds</groupId>
+ <artifactId>blazeds</artifactId>
+ <version>4.7.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
- <artifactId>flex-messaging-remoting</artifactId>
+ <artifactId>flex-messaging-remoting</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.blazeds</groupId>
- <artifactId>flex-messaging-core</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.blazeds</groupId>
+ <artifactId>flex-messaging-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <sourceDirectory>src</sourceDirectory>
- </build>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
diff --git a/remoting/src/flex/management/runtime/messaging/services/RemotingServiceControl.java b/remoting/src/main/java/flex/management/runtime/messaging/services/RemotingServiceControl.java
similarity index 100%
rename from remoting/src/flex/management/runtime/messaging/services/RemotingServiceControl.java
rename to remoting/src/main/java/flex/management/runtime/messaging/services/RemotingServiceControl.java
diff --git a/remoting/src/flex/management/runtime/messaging/services/RemotingServiceControlMBean.java b/remoting/src/main/java/flex/management/runtime/messaging/services/RemotingServiceControlMBean.java
similarity index 100%
rename from remoting/src/flex/management/runtime/messaging/services/RemotingServiceControlMBean.java
rename to remoting/src/main/java/flex/management/runtime/messaging/services/RemotingServiceControlMBean.java
diff --git a/remoting/src/flex/management/runtime/messaging/services/remoting/RemotingDestinationControl.java b/remoting/src/main/java/flex/management/runtime/messaging/services/remoting/RemotingDestinationControl.java
similarity index 100%
rename from remoting/src/flex/management/runtime/messaging/services/remoting/RemotingDestinationControl.java
rename to remoting/src/main/java/flex/management/runtime/messaging/services/remoting/RemotingDestinationControl.java
diff --git a/remoting/src/flex/management/runtime/messaging/services/remoting/RemotingDestinationControlMBean.java b/remoting/src/main/java/flex/management/runtime/messaging/services/remoting/RemotingDestinationControlMBean.java
similarity index 100%
rename from remoting/src/flex/management/runtime/messaging/services/remoting/RemotingDestinationControlMBean.java
rename to remoting/src/main/java/flex/management/runtime/messaging/services/remoting/RemotingDestinationControlMBean.java
diff --git a/remoting/src/flex/management/runtime/messaging/services/remoting/adapters/JavaAdapterControl.java b/remoting/src/main/java/flex/management/runtime/messaging/services/remoting/adapters/JavaAdapterControl.java
similarity index 100%
rename from remoting/src/flex/management/runtime/messaging/services/remoting/adapters/JavaAdapterControl.java
rename to remoting/src/main/java/flex/management/runtime/messaging/services/remoting/adapters/JavaAdapterControl.java
diff --git a/remoting/src/flex/management/runtime/messaging/services/remoting/adapters/JavaAdapterControlMBean.java b/remoting/src/main/java/flex/management/runtime/messaging/services/remoting/adapters/JavaAdapterControlMBean.java
similarity index 100%
rename from remoting/src/flex/management/runtime/messaging/services/remoting/adapters/JavaAdapterControlMBean.java
rename to remoting/src/main/java/flex/management/runtime/messaging/services/remoting/adapters/JavaAdapterControlMBean.java
diff --git a/remoting/src/flex/management/runtime/messaging/services/remoting/adapters/package-info.java b/remoting/src/main/java/flex/management/runtime/messaging/services/remoting/adapters/package-info.java
similarity index 100%
rename from remoting/src/flex/management/runtime/messaging/services/remoting/adapters/package-info.java
rename to remoting/src/main/java/flex/management/runtime/messaging/services/remoting/adapters/package-info.java
diff --git a/remoting/src/flex/management/runtime/messaging/services/remoting/package-info.java b/remoting/src/main/java/flex/management/runtime/messaging/services/remoting/package-info.java
similarity index 100%
rename from remoting/src/flex/management/runtime/messaging/services/remoting/package-info.java
rename to remoting/src/main/java/flex/management/runtime/messaging/services/remoting/package-info.java
diff --git a/remoting/src/flex/messaging/services/RemotingService.java b/remoting/src/main/java/flex/messaging/services/RemotingService.java
similarity index 100%
rename from remoting/src/flex/messaging/services/RemotingService.java
rename to remoting/src/main/java/flex/messaging/services/RemotingService.java
diff --git a/remoting/src/flex/messaging/services/remoting/PageableRowSetCache.java b/remoting/src/main/java/flex/messaging/services/remoting/PageableRowSetCache.java
similarity index 100%
rename from remoting/src/flex/messaging/services/remoting/PageableRowSetCache.java
rename to remoting/src/main/java/flex/messaging/services/remoting/PageableRowSetCache.java
diff --git a/remoting/src/flex/messaging/services/remoting/RemotingDestination.java b/remoting/src/main/java/flex/messaging/services/remoting/RemotingDestination.java
similarity index 100%
rename from remoting/src/flex/messaging/services/remoting/RemotingDestination.java
rename to remoting/src/main/java/flex/messaging/services/remoting/RemotingDestination.java
diff --git a/remoting/src/flex/messaging/services/remoting/adapters/JavaAdapter.java b/remoting/src/main/java/flex/messaging/services/remoting/adapters/JavaAdapter.java
similarity index 100%
rename from remoting/src/flex/messaging/services/remoting/adapters/JavaAdapter.java
rename to remoting/src/main/java/flex/messaging/services/remoting/adapters/JavaAdapter.java
diff --git a/remoting/src/flex/messaging/services/remoting/adapters/NoSuchMethodException.java b/remoting/src/main/java/flex/messaging/services/remoting/adapters/NoSuchMethodException.java
similarity index 100%
rename from remoting/src/flex/messaging/services/remoting/adapters/NoSuchMethodException.java
rename to remoting/src/main/java/flex/messaging/services/remoting/adapters/NoSuchMethodException.java
diff --git a/remoting/src/flex/messaging/services/remoting/adapters/NoSuchServiceException.java b/remoting/src/main/java/flex/messaging/services/remoting/adapters/NoSuchServiceException.java
similarity index 100%
rename from remoting/src/flex/messaging/services/remoting/adapters/NoSuchServiceException.java
rename to remoting/src/main/java/flex/messaging/services/remoting/adapters/NoSuchServiceException.java
diff --git a/remoting/src/flex/messaging/services/remoting/adapters/RemotingMethod.java b/remoting/src/main/java/flex/messaging/services/remoting/adapters/RemotingMethod.java
similarity index 100%
rename from remoting/src/flex/messaging/services/remoting/adapters/RemotingMethod.java
rename to remoting/src/main/java/flex/messaging/services/remoting/adapters/RemotingMethod.java
diff --git a/remoting/src/flex/messaging/services/remoting/adapters/package-info.java b/remoting/src/main/java/flex/messaging/services/remoting/adapters/package-info.java
similarity index 100%
rename from remoting/src/flex/messaging/services/remoting/adapters/package-info.java
rename to remoting/src/main/java/flex/messaging/services/remoting/adapters/package-info.java
diff --git a/remoting/src/flex/messaging/services/remoting/package-info.java b/remoting/src/main/java/flex/messaging/services/remoting/package-info.java
similarity index 100%
rename from remoting/src/flex/messaging/services/remoting/package-info.java
rename to remoting/src/main/java/flex/messaging/services/remoting/package-info.java
diff --git a/testsuite/src/test/java/remoting/amfclient/AMFConnectionTestService.java b/remoting/src/test/java/remoting/amfclient/AMFConnectionTestService.java
similarity index 100%
rename from testsuite/src/test/java/remoting/amfclient/AMFConnectionTestService.java
rename to remoting/src/test/java/remoting/amfclient/AMFConnectionTestService.java
diff --git a/testsuite/src/test/java/remoting/amfclient/ServerCustomType.java b/remoting/src/test/java/remoting/amfclient/ServerCustomType.java
similarity index 100%
rename from testsuite/src/test/java/remoting/amfclient/ServerCustomType.java
rename to remoting/src/test/java/remoting/amfclient/ServerCustomType.java
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
deleted file mode 100644
index 5ebcd39..0000000
--- a/testsuite/pom.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<!--
-
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.flex.blazeds</groupId>
- <artifactId>blazeds</artifactId>
- <version>4.7.3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>flex-messaging-testsuite</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.blazeds</groupId>
- <artifactId>flex-messaging-core</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.flex.blazeds</groupId>
- <artifactId>flex-messaging-proxy</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.flex.blazeds</groupId>
- <artifactId>flex-messaging-remoting</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>9.1.0.v20131115</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- <version>9.1.0.v20131115</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <!-- Prevent this artifact from being deployed -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/testsuite/src/test/java/regression/DoNotDeleteUntilFile.txt b/testsuite/src/test/java/regression/DoNotDeleteUntilFile.txt
deleted file mode 100644
index e69de29..0000000
--- a/testsuite/src/test/java/regression/DoNotDeleteUntilFile.txt
+++ /dev/null
