From 3ab32f61c2cf425aef94dd1974937a6a9bc58e1d Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 30 Sep 2009 16:34:45 +0000
Subject: Deprecate BKUWebStartPackage (pkcs11-signed webstart release zip
 moved to BKUWebStart)

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@516 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUOnline/pom.xml                         | 26 +++++++++++++-------------
 BKUOnline/src/main/webapp/WEB-INF/web.xml | 22 +++++++++++-----------
 2 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'BKUOnline')

diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index ed7f7d50..c42ae981 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -21,6 +21,10 @@
   </pluginRepositories>
 
   <dependencies>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
     <dependency>
       <groupId>at.gv.egiz</groupId>
       <artifactId>bkucommon</artifactId>
@@ -255,21 +259,17 @@
         <plugins>
           <plugin>
             <artifactId>maven-dependency-plugin</artifactId>
+            <groupId>org.apache.maven.plugins</groupId>
             <executions>
               <execution>
-                <phase>process-resources</phase>
+                <id>copy-webstart</id>
                 <goals>
-                  <goal>unpack</goal>
+                  <goal>unpack-dependencies</goal>
                 </goals>
                 <configuration>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>at.gv.egiz</groupId>
-                      <artifactId>BKUWebStartPackage</artifactId>
-                      <type>zip</type>
-                    </artifactItem>
-                  </artifactItems>
-                  <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
+                  <includeGroupIds>at.gv.egiz</includeGroupIds>
+                  <includeArtifactIds>BKUWebStart</includeArtifactIds>
+                  <outputDirectory>${project.build.directory}/${project.build.finalName}/webstart</outputDirectory>
                 </configuration>
               </execution>
             </executions>
@@ -279,19 +279,19 @@
       <dependencies>
         <!-- not yet available in IBIBLIO, install locally
          |   NOT REQUIRED FOR BASIC DOWNLOAD PROTOCOL
-         |-->
+         |
         <dependency>
           <groupId>org.codehaus.mojo.webstart</groupId>
           <artifactId>webstart-jnlp-servlet</artifactId>
           <version>1.0-6.0.02_ea_b02.1-SNAPSHOT</version>
-        </dependency>
+        </dependency-->
         <!-- dependency to ensure BKUWebStart is build prior to BKUOnline;
          |   transitive dependencies shall not be included in WEB-INF/lib
          |   and are provided in the BKUWebStart zip
          |   (version defined in super-pom dependencyManagement, version won't be adjusted by release:prepare) -->
         <dependency>
           <groupId>at.gv.egiz</groupId>
-          <artifactId>BKUWebStartPackage</artifactId>
+          <artifactId>BKUWebStart</artifactId>
           <version>${project.version}</version>
           <scope>provided</scope>
           <type>zip</type>
diff --git a/BKUOnline/src/main/webapp/WEB-INF/web.xml b/BKUOnline/src/main/webapp/WEB-INF/web.xml
index 3a459302..41cd400f 100644
--- a/BKUOnline/src/main/webapp/WEB-INF/web.xml
+++ b/BKUOnline/src/main/webapp/WEB-INF/web.xml
@@ -53,11 +53,11 @@
     <servlet-name>BKUApplet</servlet-name>
     <jsp-file>/applet.jsp</jsp-file>
   </servlet>
-  <servlet>
-    <servlet-name>STALService</servlet-name>
-    <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
+    <servlet>
+        <servlet-name>STALService</servlet-name>
+        <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+        </servlet>
     <servlet-mapping>
     <servlet-name>BKUServlet</servlet-name>
     <url-pattern>/http-security-layer-request</url-pattern>
@@ -112,14 +112,14 @@
     <servlet-name>JnlpDownloadServlet</servlet-name>
     <url-pattern>/webstart/*</url-pattern>
   </servlet-mapping>
-   -->
+  -->
   <!-- End BKU Web Start Config -->
 
-  <servlet-mapping>
-    <servlet-name>STALService</servlet-name>
-    <url-pattern>/stal</url-pattern>
-  </servlet-mapping>
-  <session-config>
+    <servlet-mapping>
+      <servlet-name>STALService</servlet-name>
+      <url-pattern>/stal</url-pattern>
+    </servlet-mapping>
+    <session-config>
     <session-timeout>5</session-timeout>
   </session-config>
   <welcome-file-list>
-- 
cgit v1.2.3