cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tomek...@apache.org
Subject svn commit: r979086 - in /cxf/sandbox/logbrowser: distribution/src/main/release/samples/logbrowser/ distribution/src/main/release/samples/logbrowser/src/demo/logbrowser/ distribution/src/main/release/samples/logbrowser/src/demo/logbrowser/servlet/ dist...
Date Sun, 25 Jul 2010 18:39:17 GMT
Author: tomekopo
Date: Sun Jul 25 18:39:16 2010
New Revision: 979086

URL: http://svn.apache.org/viewvc?rev=979086&view=rev
Log:
Fix bug with not returning logs by AtomPullServer in a sample. Also removed XStream depedency
from pom.xml

Modified:
    cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/pom.xml
    cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/src/demo/logbrowser/App.java
    cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/src/demo/logbrowser/servlet/Generate.java
    cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/webapp/WEB-INF/web.xml
    cxf/sandbox/logbrowser/rt/management-web/pom.xml

Modified: cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/pom.xml?rev=979086&r1=979085&r2=979086&view=diff
==============================================================================
--- cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/pom.xml (original)
+++ cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/pom.xml Sun Jul
25 18:39:16 2010
@@ -16,7 +16,8 @@
   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">
+<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>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>logbrowser-plain-webxml</artifactId>
@@ -25,6 +26,7 @@
     <properties>
         <cxf.version>[2,)</cxf.version>
     </properties>
+
     <build>
         <sourceDirectory>src</sourceDirectory>
         <plugins>
@@ -99,19 +101,13 @@
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-management-web</artifactId>
             <version>${cxf.version}</version>
-        </dependency>        
+        </dependency>
+
         <!-- Jetty is needed if you're using the CXFServlet -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
             <version>${cxf.version}</version>
         </dependency>
-        
-        <!--TODO temporary solution - remove this dependency-->
-        <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-            <version>1.3.1</version>
-        </dependency>        
     </dependencies>
 </project>

Modified: cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/src/demo/logbrowser/App.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/src/demo/logbrowser/App.java?rev=979086&r1=979085&r2=979086&view=diff
==============================================================================
--- cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/src/demo/logbrowser/App.java
(original)
+++ cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/src/demo/logbrowser/App.java
Sun Jul 25 18:39:16 2010
@@ -41,7 +41,7 @@ public class App extends Application {
     static {
         LOGS = new AtomPullServer();
         LOGS.setPageSize(30);
-        LOGS.setLoggers("demo");
+        LOGS.setLogger("demo");
         LOGS.init();
     }
 

Modified: cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/src/demo/logbrowser/servlet/Generate.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/src/demo/logbrowser/servlet/Generate.java?rev=979086&r1=979085&r2=979086&view=diff
==============================================================================
--- cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/src/demo/logbrowser/servlet/Generate.java
(original)
+++ cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/src/demo/logbrowser/servlet/Generate.java
Sun Jul 25 18:39:16 2010
@@ -32,6 +32,10 @@ import org.apache.cxf.common.logging.Log
 public class Generate extends HttpServlet {
     private static final Logger LOGGER = LogUtils.getL7dLogger(Generate.class);
 
+    static {
+        LOGGER.setLevel(Level.FINEST);
+    }
+
     private static final String LEVEL = "level";
     private static final String MESSAGE = "message";
     private static final String EXCEPTION_MESSAGE = "exceptionMessage";

Modified: cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/webapp/WEB-INF/web.xml?rev=979086&r1=979085&r2=979086&view=diff
==============================================================================
--- cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/webapp/WEB-INF/web.xml
(original)
+++ cxf/sandbox/logbrowser/distribution/src/main/release/samples/logbrowser/webapp/WEB-INF/web.xml
Sun Jul 25 18:39:16 2010
@@ -26,6 +26,15 @@
 <web-app>
 
 	<servlet>
+		<servlet-name>Generate</servlet-name>
+		<display-name>Generate log entry</display-name>
+		<servlet-class>
+			demo.logbrowser.servlet.Generate
+		</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+
+	<servlet>
 		<servlet-name>App</servlet-name>
 		<display-name>App</display-name>
 		<servlet-class>
@@ -48,21 +57,8 @@
             <param-value>
                 org.apache.cxf.interceptor.LoggingOutInterceptor
             </param-value>
-        </init-param>        
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>App</servlet-name>
-		<url-pattern>/log/*</url-pattern>
-	</servlet-mapping>
+        </init-param>
 
-	<servlet>
-		<servlet-name>Generate</servlet-name>
-		<display-name>Generate log entry</display-name>
-		<servlet-class>
-			demo.logbrowser.servlet.Generate
-		</servlet-class>
 		<load-on-startup>2</load-on-startup>
 	</servlet>
 
@@ -70,5 +66,10 @@
 		<servlet-name>Generate</servlet-name>
 		<url-pattern>/generate.do</url-pattern>
 	</servlet-mapping>
+
+	<servlet-mapping>
+		<servlet-name>App</servlet-name>
+		<url-pattern>/log/*</url-pattern>
+	</servlet-mapping>
 </web-app>
 <!-- END SNIPPET: webxml -->
\ No newline at end of file

Modified: cxf/sandbox/logbrowser/rt/management-web/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/logbrowser/rt/management-web/pom.xml?rev=979086&r1=979085&r2=979086&view=diff
==============================================================================
--- cxf/sandbox/logbrowser/rt/management-web/pom.xml (original)
+++ cxf/sandbox/logbrowser/rt/management-web/pom.xml Sun Jul 25 18:39:16 2010
@@ -110,13 +110,6 @@
             <version>1.0</version>
             <scope>provided</scope>
         </dependency>
-
-        <!--TODO temporary solution - remove this dependency-->
-        <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-            <version>1.3.1</version>
-        </dependency>
     </dependencies>
 
     <build>



Mime
View raw message