diff options
| author | clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4> | 2009-09-30 16:34:45 +0000 |
|---|---|---|
| committer | clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4> | 2009-09-30 16:34:45 +0000 |
| commit | 3ab32f61c2cf425aef94dd1974937a6a9bc58e1d (patch) | |
| tree | 979d13b8a37eeb62b3e0e6c037fa273494597d23 /BKUOnline | |
| parent | 6887677d7b5b2a8d3d0dca8e435cb8a3af0cf5b7 (diff) | |
| download | mocca-3ab32f61c2cf425aef94dd1974937a6a9bc58e1d.tar.gz mocca-3ab32f61c2cf425aef94dd1974937a6a9bc58e1d.tar.bz2 mocca-3ab32f61c2cf425aef94dd1974937a6a9bc58e1d.zip | |
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
Diffstat (limited to 'BKUOnline')
| -rw-r--r-- | BKUOnline/pom.xml | 26 | ||||
| -rw-r--r-- | BKUOnline/src/main/webapp/WEB-INF/web.xml | 22 |
2 files changed, 24 insertions, 24 deletions
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml index ed7f7d50..c42ae981 100644 --- a/BKUOnline/pom.xml +++ b/BKUOnline/pom.xml @@ -22,6 +22,10 @@ <dependencies> <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <dependency> <groupId>at.gv.egiz</groupId> <artifactId>bkucommon</artifactId> <version>1.2.7-SNAPSHOT</version> @@ -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> |