Author: kkolinko
Date: Thu Nov 10 05:37:57 2011
New Revision: 1200162
URL: http://svn.apache.org/viewvc?rev=1200162&view=rev
Log:
Merging revision 1187801 from tomcat/trunk:
Whitespace removal from remaining /java/org/apache/catalina
Part 7
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Server.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Service.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Session.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/SessionEvent.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/SessionListener.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Store.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/User.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/UserDatabase.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Server.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Server.java?rev=1200162&r1=1200161&r2=1200162&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Server.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Server.java Thu Nov 10
05:37:57 2011
@@ -5,9 +5,9 @@
* 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.
@@ -68,7 +68,7 @@ public interface Server extends Lifecycl
/**
* Set the global naming resources.
- *
+ *
* @param globalNamingResources The new global naming resources
*/
public void setGlobalNamingResources
@@ -122,7 +122,7 @@ public interface Server extends Lifecycl
*/
public void setShutdown(String shutdown);
-
+
/**
* Return the parent class loader for this component. If not set, return
* {@link #getCatalina()} {@link Catalina#getParentClassLoader()}. If
@@ -138,17 +138,17 @@ public interface Server extends Lifecycl
*/
public void setParentClassLoader(ClassLoader parent);
-
+
/**
* Return the outer Catalina startup/shutdown component if present.
*/
public Catalina getCatalina();
-
+
/**
* Set the outer Catalina startup/shutdown component if present.
*/
public void setCatalina(Catalina catalina);
-
+
// --------------------------------------------------------- Public Methods
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Service.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Service.java?rev=1200162&r1=1200161&r2=1200162&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Service.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Service.java Thu Nov 10
05:37:57 2011
@@ -141,7 +141,7 @@ public interface Service extends Lifecyc
* @return Executor
*/
public Executor getExecutor(String name);
-
+
/**
* Removes an executor from the service
* @param ex Executor
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Session.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Session.java?rev=1200162&r1=1200161&r2=1200162&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Session.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Session.java Thu Nov 10
05:37:57 2011
@@ -5,9 +5,9 @@
* 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.
@@ -132,7 +132,7 @@ public interface Session {
*
* @param id The new session identifier
* @param notify Should any associated listeners be notified that a new
- * session has been created?
+ * session has been created?
*/
public void setId(String id, boolean notify);
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/SessionEvent.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/SessionEvent.java?rev=1200162&r1=1200161&r2=1200162&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/SessionEvent.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/SessionEvent.java Thu Nov 10
05:37:57 2011
@@ -5,9 +5,9 @@
* 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.
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/SessionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/SessionListener.java?rev=1200162&r1=1200161&r2=1200162&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/SessionListener.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/SessionListener.java Thu Nov
10 05:37:57 2011
@@ -5,9 +5,9 @@
* 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.
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Store.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Store.java?rev=1200162&r1=1200161&r2=1200162&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Store.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Store.java Thu Nov 10
05:37:57 2011
@@ -5,9 +5,9 @@
* 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.
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/User.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/User.java?rev=1200162&r1=1200161&r2=1200162&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/User.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/User.java Thu Nov 10 05:37:57
2011
@@ -5,9 +5,9 @@
* 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.
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/UserDatabase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/UserDatabase.java?rev=1200162&r1=1200161&r2=1200162&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/UserDatabase.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/UserDatabase.java Thu Nov 10
05:37:57 2011
@@ -5,9 +5,9 @@
* 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.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
