diff options
Diffstat (limited to 'BKUOnline')
| -rw-r--r-- | BKUOnline/pom.xml | 50 | ||||
| -rw-r--r-- | BKUOnline/src/main/webapp/WEB-INF/web.xml | 22 |
2 files changed, 36 insertions, 36 deletions
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml index ed7f7d50..3c622bae 100644 --- a/BKUOnline/pom.xml +++ b/BKUOnline/pom.xml @@ -3,14 +3,14 @@ <parent> <artifactId>bku</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.2.7-SNAPSHOT</version> + <version>1.2.7</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>at.gv.egiz</groupId> <artifactId>BKUOnline</artifactId> <packaging>war</packaging> <name>BKU Online</name> - <version>1.2.7-SNAPSHOT</version> + <version>1.2.7</version> <pluginRepositories> <pluginRepository> @@ -22,14 +22,18 @@ <dependencies> <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <dependency> <groupId>at.gv.egiz</groupId> <artifactId>bkucommon</artifactId> - <version>1.2.7-SNAPSHOT</version> + <version>1.2.7</version> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>BKUViewer</artifactId> - <version>1.2.7-SNAPSHOT</version> + <version>1.2.7</version> </dependency> <dependency> <artifactId>BKUCertificates</artifactId> @@ -63,13 +67,13 @@ <dependency> <groupId>at.gv.egiz</groupId> <artifactId>STALService</artifactId> - <version>1.2.7-SNAPSHOT</version> + <version>1.2.7</version> <scope>compile</scope> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>STALService</artifactId> - <version>1.2.7-SNAPSHOT</version> + <version>1.2.7</version> </dependency> <!-- | TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService @@ -78,7 +82,7 @@ <dependency> <groupId>at.gv.egiz</groupId> <artifactId>STALXService</artifactId> - <version>1.2.7-SNAPSHOT</version> + <version>1.2.7</version> </dependency> <!-- | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970 @@ -115,13 +119,13 @@ <dependency> <groupId>at.gv.egiz</groupId> <artifactId>BKUApplet</artifactId> - <version>1.2.7-SNAPSHOT</version> + <version>1.2.7</version> <scope>provided</scope> </dependency> <dependency> <groupId>at.gv.egiz</groupId> <artifactId>BKUAppletExt</artifactId> - <version>1.2.7-SNAPSHOT</version> + <version>1.2.7</version> <scope>provided</scope> </dependency> <dependency> @@ -132,9 +136,9 @@ </dependencies> <scm> - <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection> - <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection> - <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url> + <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7/BKUOnline</developerConnection> + <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7/BKUOnline</connection> + <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7/BKUOnline</url> </scm> <build> <plugins> @@ -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> |