Permalink
Browse files

initial

  • Loading branch information...
1 parent 16418fa commit ae6d6b0d0ab45309f193a8cb9e9c5223003ab3d7 unknown committed Apr 9, 2012
Showing with 13 additions and 211 deletions.
  1. +5 −56 core/modules/httpoverwebsocketprotocol/pom.xml
  2. +8 −155 core/modules/pom.xml
@@ -1,16 +1,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-<parent>
-
-<groupId>com.jeny.atmosphere</groupId>
-
-<artifactId>atmosphere-integration-project</artifactId>
-
-<version>0.0.1-SNAPSHOT</version>
-
-</parent>
+ <parent>
+ <groupId>com.jeny.atmosphere</groupId>
+ <artifactId>atmosphere-integration-project</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.jeny.atmosphere</groupId>
@@ -36,23 +31,6 @@
<ahc.version>1.7.1</ahc.version>
</properties>
- <!--<repositories>-->
- <!--<repository>-->
- <!--<id>oss.sonatype.org</id>-->
- <!--<url>http://oss.sonatype.org/content/repositories/releases</url>-->
- <!--</repository>-->
- <!--<repository>-->
- <!--<id>oss.sonatype.org-snapshot</id>-->
- <!--<url>http://oss.sonatype.org/content/repositories/snapshots</url>-->
- <!--</repository>-->
- <!--<repository>-->
- <!--<id>snapshot-repository.java.net</id>-->
- <!--<name>Java.net Snapshot Repository for Maven</name>-->
- <!--<url>https://maven.java.net/content/repositories/snapshots/</url>-->
- <!--<layout>default</layout>-->
- <!--</repository>-->
- <!--</repositories>-->
-
<dependencies>
<!-- Atmosphere -->
@@ -109,24 +87,6 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.atmosphere</groupId>
- <artifactId>atmosphere-jersey</artifactId>
- <version>${atmosphere.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
- <version>${jersey.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.ning</groupId>
- <artifactId>async-http-client</artifactId>
- <version>${ahc.version}</version>
- </dependency>
-
<!--<dependency>-->
<!--<groupId>org.apache.httpcomponents</groupId>-->
<!--<artifactId>httpcore</artifactId>-->
@@ -162,17 +122,6 @@
<artifactId>maven-war-plugin</artifactId>
<version>${maven-war-plugin.version}</version>
</plugin>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
- <version>${jetty.version}</version>
- <configuration>
- <scanIntervalSeconds>5</scanIntervalSeconds>
- <webAppConfig>
- <contextPath>/tictactoe</contextPath>
- </webAppConfig>
- </configuration>
- </plugin>
</plugins>
</build>
View
@@ -1,43 +1,22 @@
<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">
- <!--<parent>-->
- <!--<groupId>org.sonatype.oss</groupId>-->
- <!--<artifactId>oss-parent</artifactId>-->
- <!--<version>5</version>-->
- <!--</parent>-->
-
<modelVersion>4.0.0</modelVersion>
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-integration-project</artifactId>
<packaging>pom</packaging>
<name>atmosphere-integration-project</name>
<version>0.0.1-SNAPSHOT</version>
- <!--<url>http://github.com/Atmosphere/atmosphere</url>-->
- <!--<scm>-->
- <!--<connection>scm:git:git@github.com:Atmosphere/atmosphere.git</connection>-->
- <!--<developerConnection>scm:git:git@github.com:Atmosphere/atmosphere.git</developerConnection>-->
- <!--<url>http://github.com/Atmosphere/atmosphere</url>-->
- <!--</scm>-->
+
<prerequisites>
<maven>2.2.0</maven>
</prerequisites>
<developers>
- <!--<developer>-->
- <!--<id>jfarcand</id>-->
- <!--<name>Jeanfrancois Arcand</name>-->
- <!--<email>jfarcand@apache.org</email>-->
- <!--</developer>-->
+ <developer>
+ <id>ekochnev</id>
+ <name>Evgeny KOchnev</name>
+ <email></email>
+ </developer>
</developers>
- <!--<issueManagement>-->
- <!--<system>bugzilla</system>-->
- <!--<url>https://github.com/Atmosphere/atmosphere/servlets/ProjectIssues</url>-->
- <!--</issueManagement>-->
- <!--<mailingLists>-->
- <!--<mailingList>-->
- <!--<name>atmosphere Dev List</name>-->
- <!--<archive>dev@github.com/Atmosphere/atmosphere</archive>-->
- <!--</mailingList>-->
- <!--</mailingLists>-->
<licenses>
<license>
<name>Apache License 2.0</name>
@@ -46,28 +25,6 @@
</license>
</licenses>
<build>
- <!--<sourceDirectory>src/main/java</sourceDirectory>-->
- <!--<scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>-->
- <!--<testSourceDirectory>src/test/java</testSourceDirectory>-->
- <!--<outputDirectory>target/classes</outputDirectory>-->
- <!--<testOutputDirectory>target/test-classes</testOutputDirectory>-->
- <!--<extensions>-->
- <!--<extension>-->
- <!--<groupId>org.jvnet.wagon-svn</groupId>-->
- <!--<artifactId>wagon-svn</artifactId>-->
- <!--<version>1.8</version>-->
- <!--</extension>-->
- <!--<extension>-->
- <!--<groupId>org.apache.maven.wagon</groupId>-->
- <!--<artifactId>wagon-ssh-external</artifactId>-->
- <!--<version>1.0-alpha-6</version>-->
- <!--</extension>-->
- <!--<extension>-->
- <!--<groupId>org.apache.maven.wagon</groupId>-->
- <!--<artifactId>wagon-webdav</artifactId>-->
- <!--<version>1.0-beta-1</version>-->
- <!--</extension>-->
- <!--</extensions>-->
<defaultGoal>install</defaultGoal>
<resources>
<resource>
@@ -89,71 +46,13 @@
<target>1.6</target>
</configuration>
</plugin>
- <!--<plugin>-->
- <!--<groupId>org.mortbay.jetty</groupId>-->
- <!--<artifactId>jetty-maven-plugin</artifactId>-->
- <!--</plugin>-->
- <!--<plugin>-->
- <!--<groupId>org.apache.maven.plugins</groupId>-->
- <!--<artifactId>maven-jar-plugin</artifactId>-->
- <!--<configuration>-->
- <!--<archive>-->
- <!--<manifestEntries>-->
- <!--<mode>development</mode>-->
- <!--<url>${pom.url}</url>-->
- <!--<implementation-version>${pom.version}</implementation-version>-->
- <!--<package>org.atmosphere</package>-->
- <!--</manifestEntries>-->
- <!--</archive>-->
- <!--</configuration>-->
- <!--</plugin>-->
- <!--<plugin>-->
- <!--<groupId>org.apache.maven.plugins</groupId>-->
- <!--<artifactId>maven-site-plugin</artifactId>-->
- <!--<version>2.1</version>-->
- <!--</plugin>-->
- <!--<plugin>-->
- <!--<groupId>org.apache.maven.plugins</groupId>-->
- <!--<artifactId>maven-release-plugin</artifactId>-->
- <!--<version>2.1</version>-->
- <!--</plugin>-->
</plugins>
- <!--<pluginManagement>-->
- <!--<plugins>-->
- <!--<plugin>-->
- <!--<groupId>org.apache.maven.plugins</groupId>-->
- <!--<artifactId>maven-eclipse-plugin</artifactId>-->
- <!--<version>2.6</version>-->
- <!--</plugin>-->
- <!--</plugins>-->
- <!--</pluginManagement>-->
</build>
<modules>
<module>httpoverwebsocketprotocol</module>
</modules>
- <!--<dependencyManagement>-->
- <!--<dependencies>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.maven</groupId>-->
- <!--<artifactId>maven-plugin-tools-api</artifactId>-->
- <!--<version>2.0</version>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.felix</groupId>-->
- <!--<artifactId>maven-bundle-plugin</artifactId>-->
- <!--<version>${felix-version}</version>-->
- <!--</dependency>-->
- <!--</dependencies>-->
- <!--</dependencyManagement>-->
- <!--<pluginRepositories>-->
- <!--<pluginRepository>-->
- <!--<id>scala-tools.org</id>-->
- <!--<name>Scala-Tools Maven2 Repository</name>-->
- <!--<url>http://scala-tools.org/repo-releases</url>-->
- <!--</pluginRepository>-->
- <!--</pluginRepositories>-->
<repositories>
<repository>
<id>oss.sonatype.org</id>
@@ -184,61 +83,15 @@
</repositories>
<dependencies>
- <!--<dependency>-->
- <!--<groupId>org.eclipse.jetty</groupId>-->
- <!--<artifactId>jetty-websocket</artifactId>-->
- <!--<version>${jetty7-version}</version>-->
- <!--<scope>provided</scope>-->
- <!--<exclusions>-->
- <!--<exclusion>-->
- <!--<groupId>javax.servlet</groupId>-->
- <!--<artifactId>servlet-api</artifactId>-->
- <!--</exclusion>-->
- <!--</exclusions>-->
- <!--</dependency>-->
+
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>5.8</version>
<scope>test</scope>
<classifier>jdk15</classifier>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.mortbay.jetty</groupId>-->
- <!--<artifactId>jetty</artifactId>-->
- <!--<version>${jetty-version}</version>-->
- <!--<scope>provided</scope>-->
- <!--<exclusions>-->
- <!--<exclusion>-->
- <!--<groupId>org.mortbay.jetty</groupId>-->
- <!--<artifactId>servlet-api</artifactId>-->
- <!--</exclusion>-->
- <!--</exclusions>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.mortbay.jetty</groupId>-->
- <!--<artifactId>jetty-util</artifactId>-->
- <!--<version>${jetty-version}</version>-->
- <!--<scope>provided</scope>-->
- <!--<exclusions>-->
- <!--<exclusion>-->
- <!--<groupId>org.mortbay.jetty</groupId>-->
- <!--<artifactId>servlet-api</artifactId>-->
- <!--</exclusion>-->
- <!--</exclusions>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.mortbay.jetty</groupId>-->
- <!--<artifactId>jetty-management</artifactId>-->
- <!--<version>${jetty-version}</version>-->
- <!--<scope>provided</scope>-->
- <!--<exclusions>-->
- <!--<exclusion>-->
- <!--<groupId>org.mortbay.jetty</groupId>-->
- <!--<artifactId>servlet-api</artifactId>-->
- <!--</exclusion>-->
- <!--</exclusions>-->
- <!--</dependency>-->
+
<dependency>
<groupId>com.ning</groupId>
<artifactId>async-http-client</artifactId>

0 comments on commit ae6d6b0

Please sign in to comment.