Repository: flex-blazeds Updated Branches: refs/heads/master abcab67de -> 85f1b0487
- Adjusted the maven build to use the Apache group-id "org.apache.flex.blazeds". - Adjusted the version to 4.6.0.0-SNAPSHOT. - Adjusted the repository urls to deploy to Apaches release and snapshot repos. - Tweaked the build to actually run (currently there are tests failing though). Project: http://git-wip-us.apache.org/repos/asf/flex-blazeds/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-blazeds/commit/85f1b048 Tree: http://git-wip-us.apache.org/repos/asf/flex-blazeds/tree/85f1b048 Diff: http://git-wip-us.apache.org/repos/asf/flex-blazeds/diff/85f1b048 Branch: refs/heads/master Commit: 85f1b0487dfac5747216c2e508e1fb0159d3d82b Parents: abcab67 Author: cdutz <[email protected]> Authored: Wed Apr 30 11:54:40 2014 +0200 Committer: cdutz <[email protected]> Committed: Wed Apr 30 11:54:40 2014 +0200 ---------------------------------------------------------------------- modules/common/pom.xml | 10 ++--- modules/core/pom.xml | 22 ++++++---- .../cluster/ClusterMembershipListener.java | 11 ++--- .../src/flex/messaging/log/HTTPRequestLog.java | 2 +- modules/opt/pom.xml | 18 ++++---- modules/opt/poms/jrun/pom.xml | 8 ++-- modules/opt/poms/oracle/pom.xml | 19 +++------ modules/opt/poms/tomcat4/pom.xml | 17 +++----- modules/opt/poms/tomcat6/pom.xml | 18 +++----- modules/opt/poms/tomcat7/pom.xml | 18 +++----- modules/opt/poms/weblogic/pom.xml | 12 +++--- modules/opt/poms/websphere/pom.xml | 17 ++------ modules/pom.xml | 43 ++++---------------- modules/proxy/pom.xml | 15 ++----- modules/remoting/pom.xml | 12 ++---- 15 files changed, 87 insertions(+), 155 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/85f1b048/modules/common/pom.xml ---------------------------------------------------------------------- diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 3d009ab..7588b2f 100755 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -21,15 +21,13 @@ limitations under the License. <modelVersion>4.0.0</modelVersion> <parent> - <groupId>com.adobe.blazeds</groupId> + <groupId>org.apache.flex.blazeds</groupId> <artifactId>blazeds</artifactId> - <version>4.5.0.0-SNAPSHOT</version> + <version>4.6.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <name>${project.artifactId}</name> - <description>${project.groupId} ${project.artifactId}</description> - <artifactId>flex-messaging-common</artifactId> + <artifactId>flex-messaging-common</artifactId> <dependencies> <dependency> @@ -49,6 +47,6 @@ limitations under the License. <build> <finalName>flex-messaging-common</finalName> <sourceDirectory>src</sourceDirectory> - <testSourceDirectory>test/src</testSourceDirectory> </build> + </project> http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/85f1b048/modules/core/pom.xml ---------------------------------------------------------------------- diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 8488733..8c3555c 100755 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -21,23 +21,28 @@ limitations under the License. <modelVersion>4.0.0</modelVersion> <parent> - <groupId>com.adobe.blazeds</groupId> + <groupId>org.apache.flex.blazeds</groupId> <artifactId>blazeds</artifactId> - <version>4.5.0.0-SNAPSHOT</version> + <version>4.6.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>flex-messaging-core</artifactId> - <name>${project.artifactId}</name> - <description>${project.groupId} ${project.artifactId}</description> <dependencies> <dependency> - <groupId>com.adobe.blazeds</groupId> + <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>jgroups</groupId> <artifactId>jgroups</artifactId> @@ -66,13 +71,16 @@ limitations under the License. <version>3.8.2</version> <scope>test</scope> </dependency> - - </dependencies> <build> <sourceDirectory>src</sourceDirectory> <testSourceDirectory>test/src</testSourceDirectory> + <testResources> + <testResource> + <directory>test/src</directory> + </testResource> + </testResources> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/85f1b048/modules/core/src/flex/messaging/cluster/ClusterMembershipListener.java ---------------------------------------------------------------------- diff --git a/modules/core/src/flex/messaging/cluster/ClusterMembershipListener.java b/modules/core/src/flex/messaging/cluster/ClusterMembershipListener.java index 36a1de5..aa38e11 100755 --- a/modules/core/src/flex/messaging/cluster/ClusterMembershipListener.java +++ b/modules/core/src/flex/messaging/cluster/ClusterMembershipListener.java @@ -35,7 +35,8 @@ class ClusterMembershipListener implements MembershipListener /** * The cluster implementation that owns this listener. */ - private JGroupsCluster cluster; + // TODO: The missing class JGroupsCluster seems to extend Cluster, but is missing from the repository. +// private JGroupsCluster cluster; /** * The list of current cluster members as we know it. @@ -54,7 +55,7 @@ class ClusterMembershipListener implements MembershipListener */ public ClusterMembershipListener(Cluster cluster) { - this.cluster = (JGroupsCluster)cluster; +// this.cluster = (JGroupsCluster)cluster; this.members = new ArrayList<Address>(); this.zombies = new ArrayList<Address>(); } @@ -119,7 +120,7 @@ class ClusterMembershipListener implements MembershipListener { if (!membershipView.containsMember(member)) { - cluster.removeClusterNode(member); +// cluster.removeClusterNode(member); zombies.remove(member); } } @@ -130,8 +131,8 @@ class ClusterMembershipListener implements MembershipListener { for (Address member : currentMemberList) { - if (!cluster.getLocalAddress().equals(member) && !members.contains(member)) - cluster.addClusterNode(member); +/* if (!cluster.getLocalAddress().equals(member) && !members.contains(member)) + cluster.addClusterNode(member);*/ } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/85f1b048/modules/core/src/flex/messaging/log/HTTPRequestLog.java ---------------------------------------------------------------------- diff --git a/modules/core/src/flex/messaging/log/HTTPRequestLog.java b/modules/core/src/flex/messaging/log/HTTPRequestLog.java index b78d302..3f7fb57 100755 --- a/modules/core/src/flex/messaging/log/HTTPRequestLog.java +++ b/modules/core/src/flex/messaging/log/HTTPRequestLog.java @@ -33,7 +33,7 @@ public class HTTPRequestLog /** * Request attribute for storing error info. */ - public static final String HTTP_ERROR_INFO = "com.adobe.internal._exception_info"; + public static final String HTTP_ERROR_INFO = "org.apache.flex.blazeds.internal._exception_info"; // Default file name private static String filename; http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/85f1b048/modules/opt/pom.xml ---------------------------------------------------------------------- diff --git a/modules/opt/pom.xml b/modules/opt/pom.xml index e55a28d..e6136e5 100755 --- a/modules/opt/pom.xml +++ b/modules/opt/pom.xml @@ -21,31 +21,29 @@ limitations under the License. <modelVersion>4.0.0</modelVersion> <parent> - <groupId>com.adobe.blazeds</groupId> + <groupId>org.apache.flex.blazeds</groupId> <artifactId>blazeds</artifactId> - <version>4.5.0.0-SNAPSHOT</version> + <version>4.6.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>flex-messaging-opt</artifactId> <packaging>pom</packaging> - <name>${project.artifactId}</name> - <description>${project.groupId} ${project.artifactId}</description> - <modules> <module>poms/tomcat7</module> <module>poms/tomcat6</module> <module>poms/tomcat4</module> - <module>poms/websphere</module> - <module>poms/weblogic</module> - <module>poms/oracle</module> - <module>poms/jrun</module> + <!-- TODO: Commented out these project as they have third-party dependencies that might be problematic. --> + <!--module>poms/websphere</module--> + <!--module>poms/weblogic</module--> + <!--module>poms/oracle</module--> + <!--module>poms/jrun</module--> </modules> <dependencies> <dependency> - <groupId>com.adobe.blazeds</groupId> + <groupId>org.apache.flex.blazeds</groupId> <artifactId>flex-messaging-core</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/85f1b048/modules/opt/poms/jrun/pom.xml ---------------------------------------------------------------------- diff --git a/modules/opt/poms/jrun/pom.xml b/modules/opt/poms/jrun/pom.xml index 68dee95..968e4b2 100755 --- a/modules/opt/poms/jrun/pom.xml +++ b/modules/opt/poms/jrun/pom.xml @@ -22,14 +22,13 @@ limitations under the License. <parent> - <groupId>com.adobe.blazeds</groupId> + <groupId>org.apache.flex.blazeds</groupId> <artifactId>flex-messaging-opt</artifactId> - <version>4.5.0.0-SNAPSHOT</version> + <version>4.6.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> + <artifactId>flex-messaging-opt-jrun</artifactId> - <description>${project.groupId} ${project.artifactId}</description> - <name>${project.artifactId}</name> <dependencies> <dependency> @@ -40,6 +39,7 @@ limitations under the License. <systemPath>${basedir}/../../lib/jrun.jar</systemPath> </dependency> </dependencies> + <properties> <appserver>jrun</appserver> <source.dir>src/jrun</source.dir> http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/85f1b048/modules/opt/poms/oracle/pom.xml ---------------------------------------------------------------------- diff --git a/modules/opt/poms/oracle/pom.xml b/modules/opt/poms/oracle/pom.xml index d48166a..777b956 100755 --- a/modules/opt/poms/oracle/pom.xml +++ b/modules/opt/poms/oracle/pom.xml @@ -20,24 +20,15 @@ limitations under the License. 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>com.adobe.blazeds</groupId> + <groupId>org.apache.flex.blazeds</groupId> <artifactId>flex-messaging-opt</artifactId> - <version>4.5.0.0-SNAPSHOT</version> + <version>4.6.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> + <artifactId>flex-messaging-opt-oracle</artifactId> - <description>${project.groupId} ${project.artifactId}</description> - <name>${project.artifactId}</name> - - <distributionManagement> - <site> - <id>blazeds_mvn_site</id> - <url>${maven.site.local.url}/flex-messaging-opt/${project.artifactId}</url> - </site> - </distributionManagement> - + <dependencies> <dependency> <groupId>com.oracle.oc4j</groupId> @@ -54,11 +45,11 @@ limitations under the License. <systemPath>${basedir}/../..//lib/jazncore.jar</systemPath> </dependency> </dependencies> + <properties> <appserver>oracle</appserver> <source.dir>src/oracle</source.dir> <exclude.pattern>none</exclude.pattern> </properties> - </project> http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/85f1b048/modules/opt/poms/tomcat4/pom.xml ---------------------------------------------------------------------- diff --git a/modules/opt/poms/tomcat4/pom.xml b/modules/opt/poms/tomcat4/pom.xml index cb777e3..57b0871 100755 --- a/modules/opt/poms/tomcat4/pom.xml +++ b/modules/opt/poms/tomcat4/pom.xml @@ -20,27 +20,19 @@ limitations under the License. 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>com.adobe.blazeds</groupId> + <groupId>org.apache.flex.blazeds</groupId> <artifactId>flex-messaging-opt</artifactId> - <version>4.5.0.0-SNAPSHOT</version> + <version>4.6.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> + <artifactId>flex-messaging-opt-tomcat4</artifactId> - <description>${project.groupId} ${project.artifactId}</description> - <name>${project.artifactId}</name> - - <distributionManagement> - <site> - <id>blazeds_mvn_site</id> - <url>${maven.site.local.url}/flex-messaging-opt/${project.artifactId}</url> - </site> - </distributionManagement> <build> <sourceDirectory>../../src/tomcat</sourceDirectory> </build> + <dependencies> <dependency> <groupId>tomcat</groupId> @@ -49,6 +41,7 @@ limitations under the License. <scope>provided</scope> </dependency> </dependencies> + <properties> <exclude.pattern.1>**/TomcatValve.java</exclude.pattern.1> <exclude.pattern.2>**/Tomcat7Valve.java</exclude.pattern.2> http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/85f1b048/modules/opt/poms/tomcat6/pom.xml ---------------------------------------------------------------------- diff --git a/modules/opt/poms/tomcat6/pom.xml b/modules/opt/poms/tomcat6/pom.xml index f1396e4..66e3cfe 100755 --- a/modules/opt/poms/tomcat6/pom.xml +++ b/modules/opt/poms/tomcat6/pom.xml @@ -20,27 +20,19 @@ limitations under the License. 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>com.adobe.blazeds</groupId> + <groupId>org.apache.flex.blazeds</groupId> <artifactId>flex-messaging-opt</artifactId> - <version>4.5.0.0-SNAPSHOT</version> + <version>4.6.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>flex-messaging-opt-tomcat6</artifactId> - <description>${project.groupId} ${project.artifactId}</description> - <name>${project.artifactId}</name> - <distributionManagement> - <site> - <id>blazeds_mvn_site</id> - <url>${maven.site.local.url}/flex-messaging-opt/${project.artifactId}</url> - </site> - </distributionManagement> + <artifactId>flex-messaging-opt-tomcat6</artifactId> <build> <sourceDirectory>../../src/tomcat</sourceDirectory> </build> + <dependencies> <dependency> <groupId>org.apache.tomcat</groupId> @@ -53,9 +45,11 @@ limitations under the License. <version>6.0.26</version> </dependency> </dependencies> + <properties> <appserver>tomcat6</appserver> <exclude.pattern.1>**/*4150.java</exclude.pattern.1> <exclude.pattern.2>**/Tomcat7Valve.java</exclude.pattern.2> </properties> + </project> http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/85f1b048/modules/opt/poms/tomcat7/pom.xml ---------------------------------------------------------------------- diff --git a/modules/opt/poms/tomcat7/pom.xml b/modules/opt/poms/tomcat7/pom.xml index 0259ce4..8e502f1 100755 --- a/modules/opt/poms/tomcat7/pom.xml +++ b/modules/opt/poms/tomcat7/pom.xml @@ -20,23 +20,14 @@ limitations under the License. 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>com.adobe.blazeds</groupId> + <groupId>org.apache.flex.blazeds</groupId> <artifactId>flex-messaging-opt</artifactId> - <version>4.5.0.0-SNAPSHOT</version> + <version>4.6.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>flex-messaging-opt-tomcat7</artifactId> - <description>${project.groupId} ${project.artifactId}</description> - <name>${project.artifactId}</name> - <distributionManagement> - <site> - <id>blazeds_mvn_site</id> - <url>${maven.site.local.url}/flex-messaging-opt/${project.artifactId}</url> - </site> - </distributionManagement> + <artifactId>flex-messaging-opt-tomcat7</artifactId> <build> <sourceDirectory>../../src/tomcat</sourceDirectory> @@ -47,6 +38,7 @@ limitations under the License. </resource> </resources> </build> + <dependencies> <dependency> <groupId>org.apache.tomcat</groupId> @@ -54,9 +46,11 @@ limitations under the License. <version>7.0.8</version> </dependency> </dependencies> + <properties> <appserver>tomcat7</appserver> <exclude.pattern.1>**/*4150.java</exclude.pattern.1> <exclude.pattern.2>**/TomcatValve.java</exclude.pattern.2> </properties> + </project> http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/85f1b048/modules/opt/poms/weblogic/pom.xml ---------------------------------------------------------------------- diff --git a/modules/opt/poms/weblogic/pom.xml b/modules/opt/poms/weblogic/pom.xml index 1c6ecfc..2f8ecf1 100755 --- a/modules/opt/poms/weblogic/pom.xml +++ b/modules/opt/poms/weblogic/pom.xml @@ -20,16 +20,14 @@ limitations under the License. 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>com.adobe.blazeds</groupId> + <groupId>org.apache.flex.blazeds</groupId> <artifactId>flex-messaging-opt</artifactId> - <version>4.5.0.0-SNAPSHOT</version> + <version>4.6.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> + <artifactId>flex-messaging-opt-weblogic</artifactId> - <description>${project.groupId} ${project.artifactId}</description> - <name>${project.artifactId}</name> <distributionManagement> <site> @@ -54,9 +52,11 @@ limitations under the License. <systemPath>${basedir}/../../lib/weblogic.jar</systemPath> </dependency> </dependencies> - <properties> + + <properties> <appserver>weblogic</appserver> <source.dir>src/weblogic</source.dir> <exclude.pattern>none</exclude.pattern> </properties> + </project> http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/85f1b048/modules/opt/poms/websphere/pom.xml ---------------------------------------------------------------------- diff --git a/modules/opt/poms/websphere/pom.xml b/modules/opt/poms/websphere/pom.xml index 5c98aff..64d3322 100755 --- a/modules/opt/poms/websphere/pom.xml +++ b/modules/opt/poms/websphere/pom.xml @@ -20,23 +20,14 @@ limitations under the License. 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>com.adobe.blazeds</groupId> + <groupId>org.apache.flex.blazeds</groupId> <artifactId>flex-messaging-opt</artifactId> - <version>4.5.0.0-SNAPSHOT</version> + <version>4.6.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>flex-messaging-opt-webpshere</artifactId> - <description>${project.groupId} ${project.artifactId}</description> - <name>${project.artifactId}</name> - <distributionManagement> - <site> - <id>blazeds_mvn_site</id> - <url>${maven.site.local.url}/flex-messaging-opt/${project.artifactId}</url> - </site> - </distributionManagement> + <artifactId>flex-messaging-opt-webpshere</artifactId> <dependencies> <dependency> @@ -61,11 +52,11 @@ limitations under the License. <systemPath>${basedir}/../../lib/sas.jar</systemPath> </dependency> </dependencies> + <properties> <appserver>websphere</appserver> <source.dir>src/websphere</source.dir> <exclude.pattern>none</exclude.pattern> </properties> - </project> http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/85f1b048/modules/pom.xml ---------------------------------------------------------------------- diff --git a/modules/pom.xml b/modules/pom.xml index a4589da..62030b7 100755 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -22,37 +22,24 @@ <modelVersion>4.0.0</modelVersion> - <groupId>com.adobe.blazeds</groupId> + <groupId>org.apache.flex.blazeds</groupId> <artifactId>blazeds</artifactId> - <version>4.5.0.0-SNAPSHOT</version> - + <version>4.6.0.0-SNAPSHOT</version> <packaging>pom</packaging> - <name>${project.artifactId} ${project.version}</name> - <description>${project.groupId} ${project.artifactId}</description> - <url>${maven.site.remote.url}</url> + + <name>Apache Flex: BlazeDS</name> <distributionManagement> - <site> - <id>blazeds_mvn_site</id> - <url>${maven.site.local.url}</url> - </site> <repository> - <id>txi_releases</id> - <url>http://txici.can.adobe.com:9999/nexus/content/repositories/txi - </url> + <id>apache.releases.https</id> + <url>https://repository.apache.org/service/local/staging/deploy/maven2</url> </repository> <snapshotRepository> - <id>txi_snapshot</id> - <url>file://C:/workspaces/opensource.adobe/cairngorm3/maven-repository</url> - <!-- - <url>http://txici.can.adobe.com:9999/nexus/content/repositories/txi_snapshots/ - </url> - --> - + <id>apache.snapshots.https</id> + <url>https://repository.apache.org/content/repositories/snapshots</url> </snapshotRepository> </distributionManagement> - <modules> <module>common</module> <module>core</module> @@ -65,15 +52,9 @@ <!-- TODO fix the failing bugs if any --> <maven.test.failure.ignore>true</maven.test.failure.ignore> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8 - </project.reporting.outputEncoding> - <maven.site.local.url>file://C:/apps/java/apache-tomcat-6.0.18-ac-cc/webapps/mvn_site/blazeds - </maven.site.local.url> - <maven.site.remote.url>http://txici.can.adobe.com:9999/mvn_site/blazeds - </maven.site.remote.url> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> </properties> - <build> <!-- <pluginManagement> <plugins> @@ -101,7 +82,6 @@ </pluginManagement> --> <plugins> - <!-- TODO scm connection and release plugin like in cairngorm3--> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> @@ -136,7 +116,6 @@ </executions> </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> @@ -145,8 +124,6 @@ </plugins> </build> - - <reporting> <plugins> <plugin> @@ -161,7 +138,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <configuration> <doclet>org.jboss.apiviz.APIviz</doclet> <docletArtifact> @@ -316,5 +292,4 @@ </pluginRepository> </pluginRepositories> - </project> http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/85f1b048/modules/proxy/pom.xml ---------------------------------------------------------------------- diff --git a/modules/proxy/pom.xml b/modules/proxy/pom.xml index 48c41eb..cb9dda7 100755 --- a/modules/proxy/pom.xml +++ b/modules/proxy/pom.xml @@ -21,20 +21,17 @@ limitations under the License. <modelVersion>4.0.0</modelVersion> <parent> - <groupId>com.adobe.blazeds</groupId> + <groupId>org.apache.flex.blazeds</groupId> <artifactId>blazeds</artifactId> - <version>4.5.0.0-SNAPSHOT</version> + <version>4.6.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <name>${project.artifactId}</name> - <description>${project.groupId} ${project.artifactId}</description> <artifactId>flex-messaging-proxy</artifactId> <dependencies> - <dependency> - <groupId>com.adobe.blazeds</groupId> + <groupId>org.apache.flex.blazeds</groupId> <artifactId>flex-messaging-core</artifactId> <version>${project.version}</version> </dependency> @@ -45,7 +42,6 @@ limitations under the License. <version>3.0.1</version> </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> @@ -53,19 +49,16 @@ limitations under the License. <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> - <testSourceDirectory>test/src</testSourceDirectory> </build> + </project> http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/85f1b048/modules/remoting/pom.xml ---------------------------------------------------------------------- diff --git a/modules/remoting/pom.xml b/modules/remoting/pom.xml index b0086d5..c9de10c 100755 --- a/modules/remoting/pom.xml +++ b/modules/remoting/pom.xml @@ -21,19 +21,17 @@ limitations under the License. <modelVersion>4.0.0</modelVersion> <parent> - <groupId>com.adobe.blazeds</groupId> + <groupId>org.apache.flex.blazeds</groupId> <artifactId>blazeds</artifactId> - <version>4.5.0.0-SNAPSHOT</version> + <version>4.6.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <name>${project.artifactId}</name> - <description>${project.groupId} ${project.artifactId}</description> <artifactId>flex-messaging-remoting</artifactId> <dependencies> <dependency> - <groupId>com.adobe.blazeds</groupId> + <groupId>org.apache.flex.blazeds</groupId> <artifactId>flex-messaging-core</artifactId> <version>${project.version}</version> </dependency> @@ -44,12 +42,10 @@ limitations under the License. <version>3.8.2</version> <scope>test</scope> </dependency> - - </dependencies> <build> <sourceDirectory>src</sourceDirectory> - <testSourceDirectory>test/src</testSourceDirectory> </build> + </project>
