[tomcat8] 04/06: Added the javax.websocket-api artifact to libservlet3.1-java

Mon Sep 16 07:21:49 UTC 2013

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tomcat8.

commit 81da06f1a8ff24e7f61e4368ef7bd002f91b418d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Sep 15 00:07:20 2013 +0200

    Added the javax.websocket-api artifact to libservlet3.1-java
---
 debian/changelog                   |    1 +
 debian/control                     |    4 ++--
 debian/javaxpoms/websocket-api.pom |   32 ++++++++++++++++++++++++++++++++
 debian/libservlet3.1-java.poms     |    1 +
 debian/maven.rules                 |    1 +
 debian/rules                       |    7 ++++---
 6 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2f7a2df..2e6c750 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ tomcat8 (8.0.0~RC1-1) UNRELEASED; urgency=low
     - Installed the new jars (spdy, jni, websocket, websocket-api, storeconfig)
     - Updated the artifactId of the specification jars to include
       the new javax prefix
+    - Added the javax.websocket-api artifact to libservlet3.1-java
   * Marked libtomcat8-java as conflicting with libtomcat7-java
   * Use XZ compression for the upstream tarball
   * Replaced Sun Microsystems with Oracle
diff --git a/debian/control b/debian/control
index e1b401e..878235c 100644
--- a/debian/control
+++ b/debian/control
@@ -83,7 +83,7 @@ Description: Apache Tomcat 8 - Servlet and JSP engine -- core libraries
 Package: libservlet3.1-java
 Architecture: all
 Depends: ${misc:Depends}
-Description: Servlet 3.1, JSP 2.3 and EL 3.0 Java API classes
+Description: Servlet 3.1, JSP 2.3, EL 3.0 and WebSocket 1.0 Java API classes
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
  specifications from Oracle, and provides a "pure Java" HTTP web
  server environment for Java code to run.
@@ -95,7 +95,7 @@ Section: doc
 Architecture: all
 Depends: ${misc:Depends}
 Suggests: libservlet3.1-java (>= ${source:Version})
-Description: Servlet 3.1, JSP 2.3 and EL 3.0 Java API documentation
+Description: Servlet 3.1, JSP 2.3, EL 3.0 and WebSocket 1.0 Java API documentation
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
  specifications from Oracle, and provides a "pure Java" HTTP web
  server environment for Java code to run.
diff --git a/debian/javaxpoms/websocket-api.pom b/debian/javaxpoms/websocket-api.pom
new file mode 100644
index 0000000..01c30aa
--- /dev/null
+++ b/debian/javaxpoms/websocket-api.pom
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>javax.websocket</groupId>
+  <artifactId>javax.websocket-api</artifactId>
+  <version>1.0</version>
+  <description>WebSocket (JSR356) API</description>
+  <url>http://tomcat.apache.org/</url>
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+</project>
diff --git a/debian/libservlet3.1-java.poms b/debian/libservlet3.1-java.poms
index f73d7f8..6d6faae 100644
--- a/debian/libservlet3.1-java.poms
+++ b/debian/libservlet3.1-java.poms
@@ -1,3 +1,4 @@
 debian/javaxpoms/servlet-api.pom --no-rules
 debian/javaxpoms/jsp-api.pom --no-rules
 debian/javaxpoms/el-api.pom --no-rules
+debian/javaxpoms/websocket-api.pom --no-rules
diff --git a/debian/maven.rules b/debian/maven.rules
index 0cd470e..a96e3de 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -2,6 +2,7 @@
 javax.servlet javax.servlet-api jar s/.*/3.1/
 javax.servlet.jsp javax.servlet.jsp-api jar s/.*/2.3/
 javax.el javax.el-api jar s/.*/3.0/
+javax.websocket javax.socket-api jar s/.*/1.0/
 
 # Publish 8.x instead of 'debian' artifacts to avoid conflicts with other versions of Tomcat
 org.apache.tomcat tomcat * s/.*/8.x/
diff --git a/debian/rules b/debian/rules
index 5d18b0a..67a58f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -151,9 +151,10 @@ binary-indep: build install
 	dh_link
 	
 	mh_installpoms -plibservlet3.1-java
-	mh_installjar -plibservlet3.1-java -l -s --usj-name=servlet-api debian/javaxpoms/servlet-api.pom $(BLDLIB)/servlet-api.jar
-	mh_installjar -plibservlet3.1-java -l -s --usj-name=jsp-api     debian/javaxpoms/jsp-api.pom     $(BLDLIB)/jsp-api.jar
-	mh_installjar -plibservlet3.1-java -l -s --usj-name=el-api      debian/javaxpoms/el-api.pom      $(BLDLIB)/el-api.jar
+	mh_installjar -plibservlet3.1-java -l -s --usj-name=servlet-api   debian/javaxpoms/servlet-api.pom   $(BLDLIB)/servlet-api.jar
+	mh_installjar -plibservlet3.1-java -l -s --usj-name=jsp-api       debian/javaxpoms/jsp-api.pom       $(BLDLIB)/jsp-api.jar
+	mh_installjar -plibservlet3.1-java -l -s --usj-name=el-api        debian/javaxpoms/el-api.pom        $(BLDLIB)/el-api.jar
+	mh_installjar -plibservlet3.1-java -l -s --usj-name=websocket-api debian/javaxpoms/websocket-api.pom $(BLDLIB)/websocket-api.jar
 	
 	rm -r debian/poms
 	rm -rf \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git

