ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1810340 - in /webservices/wss4j/trunk: pom.xml ws-security-web/pom.xml ws-security-web/src/main/java/org/apache/wss4j/web/WssServletContextListener.java
Date Mon, 02 Oct 2017 12:29:59 GMT
Author: coheigea
Date: Mon Oct  2 12:29:58 2017
New Revision: 1810340

URL: http://svn.apache.org/viewvc?rev=1810340&view=rev
Log:
Fixing the previous merge a bit

Modified:
    webservices/wss4j/trunk/pom.xml
    webservices/wss4j/trunk/ws-security-web/pom.xml
    webservices/wss4j/trunk/ws-security-web/src/main/java/org/apache/wss4j/web/WssServletContextListener.java

Modified: webservices/wss4j/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/pom.xml?rev=1810340&r1=1810339&r2=1810340&view=diff
==============================================================================
--- webservices/wss4j/trunk/pom.xml (original)
+++ webservices/wss4j/trunk/pom.xml Mon Oct  2 12:29:58 2017
@@ -119,6 +119,7 @@
         <module>ws-security-common</module>
         <module>ws-security-dom</module>
         <module>ws-security-stax</module>
+        <module>ws-security-web</module>
         <module>integration</module>
         <module>ws-security-policy-stax</module>
         <!-- <module>performance</module>-->

Modified: webservices/wss4j/trunk/ws-security-web/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-web/pom.xml?rev=1810340&r1=1810339&r2=1810340&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-web/pom.xml (original)
+++ webservices/wss4j/trunk/ws-security-web/pom.xml Mon Oct  2 12:29:58 2017
@@ -1,86 +1,66 @@
-<!-- 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. -->
+<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.wss4j</groupId>
+        <artifactId>wss4j-parent</artifactId>
+        <relativePath>../parent/pom.xml</relativePath>
+        <version>2.2.1-SNAPSHOT</version>
+    </parent>
+    <artifactId>wss4j-ws-security-web</artifactId>
+    <name>Apache WSS4J Web WS-Security</name>
+
+    <build>
+        <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <excludes>
+                    <exclude>**/*.java</exclude>
+                </excludes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
 
-	<parent>
-		<groupId>org.apache.wss4j</groupId>
-		<artifactId>wss4j-parent</artifactId>
-		<relativePath>../parent/pom.xml</relativePath>
-		<version>2.2.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>wss4j-ws-security-web</artifactId>
-	<name>Apache WSS4J web WS-Security</name>
-
-	<build>
-		<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
-		<testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
-		<resources>
-			<resource>
-				<directory>src/main/java</directory>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</resource>
-			<resource>
-				<directory>src/main/resources</directory>
-				<includes>
-					<include>**/*</include>
-				</includes>
-			</resource>
-		</resources>
-		<testResources>
-			<testResource>
-				<directory>src/test/java</directory>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</testResource>
-			<testResource>
-				<directory>src/test/resources</directory>
-				<includes>
-					<include>**/*</include>
-				</includes>
-			</testResource>
-		</testResources>
-
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>test-jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.wss4j</groupId>
-			<artifactId>wss4j-ws-security-dom</artifactId>
-			<version>${project.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>3.0.1</version>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.wss4j</groupId>
+            <artifactId>wss4j-ws-security-dom</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.0.1</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
 
 </project>

Modified: webservices/wss4j/trunk/ws-security-web/src/main/java/org/apache/wss4j/web/WssServletContextListener.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-web/src/main/java/org/apache/wss4j/web/WssServletContextListener.java?rev=1810340&r1=1810339&r2=1810340&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-web/src/main/java/org/apache/wss4j/web/WssServletContextListener.java
(original)
+++ webservices/wss4j/trunk/ws-security-web/src/main/java/org/apache/wss4j/web/WssServletContextListener.java
Mon Oct  2 12:29:58 2017
@@ -1,3 +1,21 @@
+/**
+ * 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.
+ */
 package org.apache.wss4j.web;
 
 import javax.servlet.ServletContextEvent;
@@ -13,13 +31,13 @@ import org.apache.wss4j.dom.engine.WSSCo
 @WebListener
 public class WssServletContextListener implements ServletContextListener {
 
-  @Override
-  public void contextDestroyed(ServletContextEvent servletContextEvent) {
-    WSSConfig.cleanUp();
-  }
-
-  @Override
-  public void contextInitialized(ServletContextEvent servletContextEvent) {
-  }
+    @Override
+    public void contextDestroyed(ServletContextEvent servletContextEvent) {
+        WSSConfig.cleanUp();
+    }
+
+    @Override
+    public void contextInitialized(ServletContextEvent servletContextEvent) {
+    }
 
 }



Mime
View raw message