Commits

Andy Moncsek committed a0e62fe

updated to final versions

  • Participants
  • Parent commits 1a87a4d

Comments (0)

Files changed (6)

File EAR-ChatWebsocket/src/main/application/META-INF/application.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2013, Andy Moncsek, inc.
+  ~ All rights reserved.
+  ~
+  ~ Redistribution and use in source and binary forms, with or without modification, are permitted provided
+  ~ that the following conditions are met:
+  ~
+  ~    Redistributions of source code must retain the above copyright notice, this list of conditions and the
+  ~    following disclaimer.
+  ~
+  ~    Redistributions in binary form must reproduce the above copyright notice, this list of conditions and
+  ~    the following disclaimer in the documentation and/or other materials provided with the distribution.
+  ~
+  ~    Neither the name of Andy Moncsek, inc. nor the names of its contributors may be used to endorse or
+  ~    promote products derived from this software without specific prior written permission.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+  ~ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+  ~ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+  ~ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+  ~ TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  ~ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  ~ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  ~ POSSIBILITY OF SUCH DAMAGE.
+  -->
+
+<application xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_6.xsd" version="6">
+    <description>Root pom.xml for all other submodules</description>
+    <display-name>EAR-ChatWebsocket</display-name>
+    <module>
+        <ejb>EJB-1.0.jar</ejb>
+    </module>
+    <module>
+        <web>
+            <web-uri>WebClient-ChatWebsocket-1.0.war</web-uri>
+            <context-root>/WebClient-ChatWebsocket</context-root>
+        </web>
+    </module>
+</application>

File JacpFXChatWebsocketClient/pom.xml

     <packaging>jar</packaging>
     <name>JacpFXChatWebsocketClient</name>
     <url>http://maven.apache.org</url>
-    <repositories>
-        <repository>
-            <id>jacp</id>
-            <url>http://developer.ahcp.de/nexus/content/repositories/jacp</url>
-        </repository>
-    </repositories>
     <developers>
         <developer>
             <id>amo</id>

File JacpFXTwitterSSEClient/pom.xml

     <packaging>jar</packaging>
     <name>JacpFXTwitterSSEClient</name>
     <url>http://maven.apache.org</url>
-    <repositories>
-        <repository>
-            <id>jacp</id>
-            <url>http://developer.ahcp.de/nexus/content/repositories/jacp</url>
-        </repository>
-    </repositories>
     <developers>
         <developer>
             <id>amo</id>

File JacpFXTwitterWebsocketClient/pom.xml

     <packaging>jar</packaging>
     <name>JacpFXTwitterWebsocketClient</name>
     <url>http://maven.apache.org</url>
-    <repositories>
-        <repository>
-            <id>jacp</id>
-            <url>http://developer.ahcp.de/nexus/content/repositories/jacp</url>
-        </repository>
-    </repositories>
     <developers>
         <developer>
             <id>amo</id>

File WebClient-ChatWebsocket/pom.xml

             <version>${project.version}</version>
         </dependency>
     </dependencies>
+    <build>
+        <finalName>${artifactId}-${version}</finalName>
+    </build>
 </project>
     <packaging>pom</packaging>
     <description>Root pom.xml for all other submodules</description>
     <repositories>
-        <repository>
+<!--        <repository>
             <id>java.net-promoted</id>
             <url>https://maven.java.net/content/groups/promoted/</url>
-        </repository>
+        </repository>-->
         <repository>
             <id>prime-repo</id>
             <name>PrimeFacesMaven Repository</name>
             <id>EclipseLink</id>
             <url>http://download.eclipse.org/rt/eclipselink/maven.repo</url>
         </repository>
+        <repository>
+            <id>jacp</id>
+            <url>http://developer.ahcp.de/nexus/content/repositories/jacp</url>
+        </repository>
     </repositories>
     <profiles>
         <profile>
   </modules>
     <properties>
         <javax.persistence.version>2.0.0</javax.persistence.version>
-        <jee.version>7.0-b83</jee.version>
-        <glassfish.version>4.0-b83</glassfish.version>
-        <jersey.version>2.0-rc1</jersey.version>
+        <jee.version>7.0</jee.version>
+        <glassfish.version>4.0</glassfish.version>
+        <jersey.version>2.0</jersey.version>
         <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
         <junit.version>4.11</junit.version>
-        <tyrusWebsocket.version>1.0-rc1</tyrusWebsocket.version>
-        <!-- <tyrusWebsocket.version>1.0-SNAPSHOT</tyrusWebsocket.version> -->
+        <tyrusWebsocket.version>1.0</tyrusWebsocket.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <javafx.version>2.2</javafx.version>
         <jacp.version>1.2</jacp.version>
                     <version>2.1.1</version>
                     <configuration>
                         <failOnMissingWebXml>false</failOnMissingWebXml>
+                        <warName>${artifactId}-${version}</warName>
                     </configuration>
                 </plugin>
             </plugins>