You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2016/12/22 14:23:30 UTC
[8/8] cxf git commit: [CXF-7192] Removing cxf-rt-management-web
module, to be restored on demand
[CXF-7192] Removing cxf-rt-management-web module, to be restored on demand
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7f4a24d0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7f4a24d0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7f4a24d0
Branch: refs/heads/master
Commit: 7f4a24d037c06f76770e969ad7e2a47f4687a33a
Parents: 337742f
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Thu Dec 22 14:22:58 2016 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Thu Dec 22 14:22:58 2016 +0000
----------------------------------------------------------------------
.../samples/logbrowser-blueprint/README.txt | 39 --
.../samples/logbrowser-blueprint/pom.xml | 109 ----
.../resources/OSGI-INF/blueprint/context.xml | 56 --
.../src/test/resources/index_plain.html | 211 -------
.../main/release/samples/logbrowser/README.txt | 49 --
.../samples/logbrowser/logging.properties | 27 -
.../src/main/release/samples/logbrowser/pom.xml | 153 -----
.../src/main/java/demo/logbrowser/App.java | 58 --
.../src/main/java/demo/service/App.java | 36 --
.../main/java/demo/service/CustomerService.java | 141 -----
.../src/main/java/demo/service/Server.java | 60 --
.../logbrowser/src/main/webapp/WEB-INF/web.xml | 65 --
.../src/main/webapp/customer-service.html | 179 ------
.../src/main/webapp/jquery-1.4.2.min.js | 154 -----
distribution/src/main/release/samples/pom.xml | 2 -
rt/management-web/README.txt | 18 -
rt/management-web/pom.xml | 328 ----------
.../src/main/appended-resources/META-INF/NOTICE | 12 -
.../management/web/browser/LogBrowser.gwt.xml | 31 -
.../browser/bootstrapping/BootstrapStorage.java | 242 --------
.../web/browser/bootstrapping/Settings.java | 42 --
.../browser/bootstrapping/SettingsStorage.java | 26 -
.../bootstrapping/SimpleXMLSettingsStorage.java | 205 ------
.../web/browser/bootstrapping/Subscription.java | 55 --
.../web/browser/client/DefaultEventBus.java | 34 -
.../web/browser/client/Dispatcher.java | 114 ----
.../management/web/browser/client/Injector.java | 35 --
.../web/browser/client/LogBrowser.java | 48 --
.../management/web/browser/client/Module.java | 91 ---
.../client/event/ChangedFilterOptionsEvent.java | 51 --
.../event/ChangedFilterOptionsEventHandler.java | 26 -
.../client/event/ChangedSubscriptionsEvent.java | 40 --
.../event/ChangedSubscriptionsEventHandler.java | 26 -
.../browser/client/event/GoToBrowserEvent.java | 39 --
.../client/event/GoToBrowserEventHandler.java | 26 -
.../client/event/GoToEditCriteriaEvent.java | 39 --
.../event/GoToEditCriteriaEventHandler.java | 26 -
.../browser/client/event/GoToSettingsEvent.java | 39 --
.../client/event/GoToSettingsEventHandler.java | 26 -
.../client/event/SelectedSubscriptionEvent.java | 50 --
.../event/SelectedSubscriptionEventHandler.java | 26 -
.../client/service/AbstractCallback.java | 51 --
.../browser/client/service/browser/Entry.java | 220 -------
.../browser/client/service/browser/Feed.java | 88 ---
.../client/service/browser/FeedProxy.java | 26 -
.../client/service/browser/FeedProxyImpl.java | 86 ---
.../client/service/browser/FilterOptions.java | 72 ---
.../browser/client/service/browser/Links.java | 159 -----
.../service/settings/IdentifierGenerator.java | 23 -
.../settings/IdentifierGeneratorImpl.java | 26 -
.../service/settings/RemoteStorageProxy.java | 29 -
.../settings/RemoteStorageProxyImpl.java | 255 --------
.../client/service/settings/Settings.java | 38 --
.../client/service/settings/SettingsFacade.java | 221 -------
.../client/service/settings/Subscription.java | 72 ---
.../web/browser/client/ui/AbstractDialog.java | 37 --
.../web/browser/client/ui/BasePresenter.java | 69 --
.../web/browser/client/ui/BindStrategy.java | 30 -
.../client/ui/DialogBindStrategyImpl.java | 42 --
.../web/browser/client/ui/ErrorDialog.java | 161 -----
.../web/browser/client/ui/Presenter.java | 28 -
.../web/browser/client/ui/PresenterWidget.java | 27 -
.../management/web/browser/client/ui/View.java | 26 -
.../client/ui/WidgetBindStrategyImpl.java | 39 --
.../client/ui/browser/BrowsePresenter.java | 49 --
.../browser/client/ui/browser/BrowseView.java | 36 --
.../browser/client/ui/browser/BrowseView.ui.xml | 41 --
.../client/ui/browser/BrowseViewImpl.java | 74 ---
.../ui/browser/EditCriteriaPresenter.java | 83 ---
.../client/ui/browser/EditCriteriaView.java | 48 --
.../client/ui/browser/EditCriteriaView.ui.xml | 71 ---
.../client/ui/browser/EditCriteriaViewImpl.java | 117 ----
.../browser/client/ui/browser/EntryTable.java | 28 -
.../ui/browser/NavigationSidebarPresenter.java | 187 ------
.../ui/browser/NavigationSidebarView.java | 42 --
.../ui/browser/NavigationSidebarView.ui.xml | 58 --
.../ui/browser/NavigationSidebarViewImpl.java | 120 ----
.../client/ui/browser/SelectableTable.java | 268 --------
.../client/ui/browser/SubscriptionTable.java | 28 -
.../client/ui/browser/ViewerPresenter.java | 154 -----
.../browser/client/ui/browser/ViewerView.java | 53 --
.../browser/client/ui/browser/ViewerView.ui.xml | 83 ---
.../client/ui/browser/ViewerViewImpl.java | 203 ------
.../ui/common/NavigationHeaderPresenter.java | 50 --
.../client/ui/common/NavigationHeaderView.java | 31 -
.../ui/common/NavigationHeaderView.ui.xml | 35 --
.../ui/common/NavigationHeaderViewImpl.java | 60 --
.../client/ui/resources/LogBrowserConstans.java | 62 --
.../client/ui/resources/LogBrowserCss.java | 77 ---
.../ui/resources/LogBrowserResources.java | 32 -
.../web/browser/client/ui/resources/loader.gif | Bin 1849 -> 0 bytes
.../browser/client/ui/resources/logbrowser.css | 290 ---------
.../client/ui/settings/SettingsPresenter.java | 159 -----
.../client/ui/settings/SettingsView.java | 47 --
.../client/ui/settings/SettingsView.ui.xml | 82 ---
.../client/ui/settings/SettingsViewImpl.java | 152 -----
.../client/ui/settings/SubscriptionDialog.java | 50 --
.../ui/settings/SubscriptionDialogImpl.java | 146 -----
.../client/ui/settings/SubscriptionEntry.ui.xml | 40 --
.../client/ui/settings/SubscriptionForm.ui.xml | 62 --
.../web/browser/resources/LogBrowser.html | 43 --
.../management/web/browser/resources/custom.css | 16 -
.../web/browser/resources/json2.min.js | 7 -
.../web/browser/resources/uuid.min.js | 9 -
.../cxf/management/web/logging/LogLevel.java | 89 ---
.../cxf/management/web/logging/LogRecord.java | 190 ------
.../cxf/management/web/logging/LogRecords.java | 65 --
.../web/logging/ReadOnlyFileStorage.java | 621 ------------------
.../web/logging/ReadWriteLogStorage.java | 40 --
.../web/logging/ReadableLogStorage.java | 59 --
.../web/logging/atom/AbstractAtomBean.java | 180 ------
.../web/logging/atom/AtomPullHandler.java | 61 --
.../web/logging/atom/AtomPullServer.java | 622 -------------------
.../web/logging/atom/AtomPushBean.java | 194 ------
.../web/logging/atom/AtomPushEngine.java | 223 -------
.../atom/AtomPushEngineConfigurator.java | 210 -------
.../web/logging/atom/AtomPushHandler.java | 191 ------
.../atom/AtomPushOverWebSocketServer.java | 242 --------
.../cxf/management/web/logging/atom/Hold.java | 35 --
.../web/logging/atom/LoggingThread.java | 51 --
.../web/logging/atom/converter/Converter.java | 38 --
.../atom/converter/StandardConverter.java | 356 -----------
.../web/logging/atom/deliverer/Deliverer.java | 42 --
.../atom/deliverer/RetryingDeliverer.java | 143 -----
.../atom/deliverer/WebClientDeliverer.java | 62 --
.../web/logging/atom/package-info.java | 28 -
.../management/web/logging/package-info.java | 31 -
.../src/test/gwt-debug/WEB-INF/web.xml | 49 --
.../src/test/gwt-debug/generate.html | 67 --
.../cxf/management/web/logging/Generate.java | 100 ---
.../cxf/management/web/logging/MockApp.java | 75 ---
.../web/logging/ReadOnlyFileStorageTest.java | 288 ---------
.../web/logging/logs/2011-01-22-karaf.log | 34 -
.../web/logging/logs/2011-01-23-karaf.log | 31 -
rt/pom.xml | 1 -
135 files changed, 12470 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/distribution/src/main/release/samples/logbrowser-blueprint/README.txt
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/logbrowser-blueprint/README.txt b/distribution/src/main/release/samples/logbrowser-blueprint/README.txt
deleted file mode 100644
index 80bf7e3..0000000
--- a/distribution/src/main/release/samples/logbrowser-blueprint/README.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-Building and running the logbrowser-blueprint demo on Karaf
-----------------------------------------------------
-
-From the base directory of this sample (i.e., where this README file is
-located), the pom.xml file is used to build and run the demo.
-
-Using either UNIX or Windows:
-
-0) Build the project by typing:
- mvn clean install
-
-This sample project generates a bundle file which can be used in an OSGi container.
-
-Assuming you have a freshly intalled Apache Karaf-3.x,
-1) Start Karaf and at its console, type(*Note)
- feature:repo-add cxf 3.0.2
- feature:install cxf-management-web
- install -s mvn:org.apache.cxf.samples/logbrowser-blueprint/3.0.2
-
-2) Open browser and go to:
- http://localhost:8181/cxf/samples/logbrowser/browser/LogBrowser.html
-
-3) Add a new endpoint with URL:
- http://localhost:8181/cxf/samples/logbrowser/logs
-
-4) To generate custom log entry, run some CXF scenarios that write some logs.
-
-Additional features
-5) Open the Log-Browser(PlainView) page by opening file test/resources/index_plain.html in the browser.
-
-6) Click on the Connect button to open a WebSocket connection to the log browser service.
-Once the connection is open, click on the Subscribe button to subscribe to the logging feed.
-When there are new log entries, they will be pushed to the socket and displayed on the Log text area.
-
-*Note:
-- CXF version 3.0.2 is used in this example, but any verions that include this
-sample code may be used.
-- The default logging setting is set to org.apache.cxf:INFO. This can be changed
-in the configuration file org.apache.cxf.samples.logbrowser.cfg file in etc/.
http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/distribution/src/main/release/samples/logbrowser-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/logbrowser-blueprint/pom.xml b/distribution/src/main/release/samples/logbrowser-blueprint/pom.xml
deleted file mode 100644
index 0dc787a..0000000
--- a/distribution/src/main/release/samples/logbrowser-blueprint/pom.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0"?>
-<!--
- 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>
- <artifactId>logbrowser-blueprint</artifactId>
- <packaging>bundle</packaging>
- <name>Apache CXF Samples LogBrowser Blueprint</name>
- <description>Apacher CXF Samples LogBrowser Blueprint</description>
- <parent>
- <groupId>org.apache.cxf.samples</groupId>
- <artifactId>cxf-samples</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.groupId}.${project.artifactId};blueprint.aries.xml-validation:=false</Bundle-SymbolicName>
- <Import-Package>
- org.apache.cxf.jaxrs.servlet,
- org.apache.abdera.parser.stax,
- org.apache.abdera,
- com.ctc.wstx.stax,
- org.eclipse.jetty.continuation;resolution:=optional;version="[7.6,9)",
- org.eclipse.jetty.websocket;resolution:=optional;version="[7.6,9)",
- org.eclipse.jetty.websocket.api;resolution:=optional;version="[9.1,10)",
- org.eclipse.jetty.websocket.server;resolution:=optional;version="[9.1,10)",
- org.eclipse.jetty.websocket.servlet;resolution:=optional;version="[9.1,10)",
- org.apache.catalina;resolution:=optional;version="[6.0,9)",
- org.apache.catalina.comet;resolution:=optional;version="[6.0,9)",
- org.apache.catalina.connector;resolution:=optional;version="[6.0,9)",
- org.apache.catalina.util;resolution:=optional;version="[6.0,9)",
- org.apache.catalina.websocket;resolution:=optional;version="[6.0,9)",
- org.apache.coyote.http11.upgrade;resolution:=optional,
- *
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-management-web</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-extension-search</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-websocket</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.abdera</groupId>
- <artifactId>abdera-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.abdera</groupId>
- <artifactId>abdera-parser</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mime4j-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/distribution/src/main/release/samples/logbrowser-blueprint/src/main/resources/OSGI-INF/blueprint/context.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/logbrowser-blueprint/src/main/resources/OSGI-INF/blueprint/context.xml b/distribution/src/main/release/samples/logbrowser-blueprint/src/main/resources/OSGI-INF/blueprint/context.xml
deleted file mode 100644
index 54c9c94..0000000
--- a/distribution/src/main/release/samples/logbrowser-blueprint/src/main/resources/OSGI-INF/blueprint/context.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:cxf="http://cxf.apache.org/blueprint/core"
- xmlns:jaxrs="http://cxf.apache.org/blueprint/jaxrs"
- xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
-
- xsi:schemaLocation="
- http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd
- http://cxf.apache.org/blueprint/core http://cxf.apache.org/schemas/blueprint/core.xsd
- http://cxf.apache.org/blueprint/jaxrs http://cxf.apache.org/schemas/blueprint/jaxrs.xsd
- http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0 http://aries.apache.org/schemas/blueprint-cm/blueprint-cm-1.1.0.xsd">
-
- <cm:property-placeholder id="props" persistent-id="org.apache.cxf.samples.logbrowser" update-strategy="reload">
- <cm:default-properties>
- <cm:property name="logger" value="org.apache.cxf:INFO" />
- </cm:default-properties>
- </cm:property-placeholder>
-
- <bean id="bs-sxs" class="org.apache.cxf.management.web.browser.bootstrapping.SimpleXMLSettingsStorage" />
-
- <bean id="bs" class="org.apache.cxf.management.web.browser.bootstrapping.BootstrapStorage">
- <argument ref="bs-sxs" index="0"/>
- </bean>
-
- <bean id="bs-sfp" class="org.apache.cxf.management.web.browser.bootstrapping.BootstrapStorage$StaticFileProvider" />
-
- <bean id="bs-sp" class="org.apache.cxf.management.web.browser.bootstrapping.BootstrapStorage$SettingsProvider" />
-
- <bean id="scp" class="org.apache.cxf.jaxrs.ext.search.SearchContextProvider" />
-
- <bean id="aps" class="org.apache.cxf.management.web.logging.atom.AtomPullServer" init-method="init">
- <property name="loggers" value="${logger}"/>
- </bean>
-
- <bean id="afp" class="org.apache.cxf.jaxrs.provider.atom.AtomFeedProvider" />
-
- <bean id="aep" class="org.apache.cxf.jaxrs.provider.atom.AtomEntryProvider" />
-
- <bean id="srp" class="org.apache.cxf.jaxrs.provider.StreamingResponseProvider" />
-
- <jaxrs:server id="serviceEndpoint" address="/samples/logbrowser" transportId="http://cxf.apache.org/transports/websocket">
- <jaxrs:serviceBeans>
- <ref component-id="aps" />
- <ref component-id="bs" />
- </jaxrs:serviceBeans>
- <jaxrs:providers>
- <ref component-id="bs-sfp" />
- <ref component-id="bs-sp" />
- <ref component-id="scp" />
- <ref component-id="afp" />
- <ref component-id="aep" />
- <ref component-id="srp" />
- </jaxrs:providers>
- </jaxrs:server>
-</blueprint>
http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/distribution/src/main/release/samples/logbrowser-blueprint/src/test/resources/index_plain.html
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/logbrowser-blueprint/src/test/resources/index_plain.html b/distribution/src/main/release/samples/logbrowser-blueprint/src/test/resources/index_plain.html
deleted file mode 100644
index f30ecf6..0000000
--- a/distribution/src/main/release/samples/logbrowser-blueprint/src/test/resources/index_plain.html
+++ /dev/null
@@ -1,211 +0,0 @@
-<?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.
-
--->
-<html>
-<head>
-<meta charset="utf-8"/>
-<title>CXF Log-Browser using WebSocket (PlainView)</title>
-</head>
-<body>
-<h2>CXF Log-Browser using WebSocket (PlainView)</h2>
-<p>The purpose of this page is simply show how the log-feed can be subscribed and the log records are pushed over the WebSocket.</p>
-<div id="output">
- <div id="config" style="float: left; width: 600px">
- <strong>Log-Browser Endpoint URL:</strong><br />
- <input id="wsUri" size="72" style="width: 100%" value="ws://localhost:8181/cxf/samples/logbrowser"/>
- <br/>
- <button id="connect">Connect</button>
- <button id="disconnect">Disconnect</button>
- <br />
- <br />
- <button id="subscribe">Subscribe</button>
- <button id="unsubscribe">Unsubscribe</button>
- <br />
- <br />
- <input id="modeatom" type="checkbox" name="mode" value="atom"/>Atom<br/>
- <br />
- <br />
- </div>
- <div id="log" style="float: left; width: 90%; height: 500px">
- <strong>Log:</strong><br />
- <button id="clearLogBut" style="position: relative; top: 3px;">Clear log</button>
- <div id="consoleLog" style="margin-top: 5px; border: solid 1px #aaaaaa; overflow-y: scroll; height:100%"></div>
- </div>
- <div class="clearfix"></div>
-</div>
-<script language="javascript" type="text/javascript">
- var output;
-
- var connectBut = document.getElementById("connect");
- connectBut.onclick = doConnect;
-
- var disconnectBut = document.getElementById("disconnect");
- disconnectBut.onclick = doDisconnect;
-
- var subBut = document.getElementById("subscribe");
- subBut.onclick = doSub;
-
- var unsubBut = document.getElementById("unsubscribe");
- unsubBut.onclick = doUnsub;
-
- var modeatomCB = document.getElementById("modeatom");
-
- var consoleLog = document.getElementById("consoleLog");
-
- var clearLogBut = document.getElementById("clearLogBut");
- clearLogBut.onclick = clearLog;
-
- function init() {
- output = document.getElementById("output");
- setGuiConnected(false);
- }
-
- function doConnect() {
- var wsUri = document.getElementById("wsUri");
-
- websocket = new WebSocket(wsUri.value);
- websocket.binaryType = 'arraybuffer';
-
- websocket.onopen = function(evt) {
- onOpen(evt)
- };
-
- websocket.onclose = function(evt) {
- onClose(evt)
- };
-
- websocket.onmessage = function(evt) {
- onMessage(evt)
- };
-
- websocket.onerror = function(evt) {
- onError(evt)
- };
- }
-
- function doDisconnect() {
- // unsubscribe
- websocket.close()
- }
-
- function clearLog() {
- while (consoleLog.childNodes.length > 0) {
- consoleLog.removeChild(consoleLog.lastChild);
- }
- }
-
- function onOpen(evt) {
- writeToLog('<span style="color:black; font-size:75%; font-style:italic">CONNECTED</span>');
- setGuiConnected(true);
- }
-
- function onClose(evt) {
- writeToLog('<span style="color:black; font-size:75%; font-style:italic">DISCONNECTED</span>');
- setGuiConnected(false);
- }
-
- function onMessage(evt) {
- writeToLog(createMessage(extractBody(evt.data)), true);
- }
-
- function onError(evt) {
- writeToLog('<span style="color:red; font-size:75%; font-style:italic">ERROR</span><span style="color: red;"><pre>' + evt.data + '</pre></span>');
- }
-
- function doSub(evt) {
- var msg = modeatomCB.checked ? "GET /cxf/samples/logbrowser/logs/subscribe" : "GET /cxf/samples/logbrowser/logs/subscribe/alternate";
- writeToLog('<span style="color:green; font-size:75%; font-style:italic">SENT</span><span style="color: green;"><pre>' + createMessage(msg) + '</pre></span>');
- websocket.send(msg);
- setGuiSubscribed(true);
- }
-
- function doUnsub(evt) {
- var msg = "GET /cxf/samples/logbrowser/logs/unsubscribe/*";
- writeToLog('<span style="color:green; font-size:75%; font-style:italic">SENT</span><span style="color: green;"><pre>' + createMessage(msg) + '</pre></span>');
- websocket.send(msg);
- setGuiSubscribed(false);
- }
-
- function setGuiConnected(isConnected) {
- wsUri.disabled = isConnected;
- connectBut.disabled = isConnected;
- disconnectBut.disabled = !isConnected;
- subBut.disabled = !isConnected;
- unsubBut.disabled = true;
- modeatomCB.disabled = !isConnected;
- }
-
- function setGuiSubscribed(isSubscribed) {
- subBut.disabled = isSubscribed;
- unsubBut.disabled = !isSubscribed;
- modeatomCB.disabled = isSubscribed;
- }
-
- // painfully extracting the body by finding the \n delimiter
- function extractBody(data) {
- var ba = new Uint8Array(data);
- var aa = new Array(ba.length);
- var skipping = true;
- var maystart = true;
- for (i = 0; i < ba.length; i++) {
- if (skipping) {
- if (ba[i] == 10) {
- if (maystart) {
- skipping = false;
- } else {
- maystart = true;
- }
- } else {
- if (ba[i] != 13) {
- maystart = false;
- }
- continue;
- }
- }
- aa[i] = String.fromCharCode(ba[i]);
- }
- return Array.prototype.slice.call(aa).join("");
- }
-
- function createMessage(data) {
- return data.replace(/&/g, '&').replace(/</g, '<');
- }
-
- function writeToLog(message, raw) {
- var pre = document.createElement(raw ? "code" : "p");
- pre.wordWrap = "break-word";
- pre.innerHTML = message;
- consoleLog.appendChild(pre);
- if (raw) {
- consoleLog.appendChild(document.createElement("br"));
- consoleLog.appendChild(document.createElement("br"));
- }
- while (consoleLog.childNodes.length > 100) {
- consoleLog.removeChild(consoleLog.firstChild);
- }
-
- consoleLog.scrollTop = consoleLog.scrollHeight;
- }
-
- window.addEventListener("load", init, false);
-
- </script>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/distribution/src/main/release/samples/logbrowser/README.txt
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/logbrowser/README.txt b/distribution/src/main/release/samples/logbrowser/README.txt
deleted file mode 100644
index 454838f..0000000
--- a/distribution/src/main/release/samples/logbrowser/README.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-Building and running the logbrowser demo using Maven
-----------------------------------------------------
-
-From the base directory of this sample (i.e., where this README file is
-located), the pom.xml file is used to build and run the demo.
-
-Using either UNIX or Windows:
-
-0) Build the project by typing:
- mvn clean install
-1) Start the server:
- mvn -Pserver
-2) Open browser and go to:
- http://localhost:9002/log/browser/LogBrowser.html
-3) Add new endpoint with URL:
- http://localhost:9002/log/logs
-4) To generate custom log entry open new browser's window and go to:
- http://localhost:9002/customer-service.html
-
-To remove the .class files, run "mvn clean".
-
-
-This sample project generates a war file which can be used in a servlet container
-or even in an OSGi container.
-
-Assuming you have a freshly intalled Apache Karaf-3.x,
-1) Start Karaf and at its console, type(*Note)
- feature:repo-add cxf 3.0.2
- feature:install war
- feature:install cxf-management-web
- install -s mvn:org.apache.cxf.samples/logbrowser/3.0.2/war
-
-2) Open browser and go to:
- http://localhost:8181/cxf-samples-logbrowser/log/browser/LogBrowser.html
-3) Add new endpoint with URL:
- http://localhost:8181/cxf-samples-logbrowser/log/logs
-4) To generate custom log entry open new browser's window and go to:
- http://localhost:8181/cxf-samples-logbrowser/customer-service.html
-
-*Note:
-- CXF version 3.0.2 is used in this example, but any verions that include this
-sample code may be used.
-- As this web.xml registers two CXFServlets (one for the browsing the log and
-the other for providing the test service), OSGi system property
-org.apache.cxf.osgi.http.transport.disable must be set to false
-(in etc/system.properties) to allow these two servlets to be started.
-However, this will disable the auto-registration of normal CXF endpoints.
-To avoid this issue, use samples/logbrowser-blueprint which is compatible
-with the normal CXF endpoints.
http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/distribution/src/main/release/samples/logbrowser/logging.properties
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/logbrowser/logging.properties b/distribution/src/main/release/samples/logbrowser/logging.properties
deleted file mode 100644
index fb0c6a2..0000000
--- a/distribution/src/main/release/samples/logbrowser/logging.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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.
-
-handlers = java.util.logging.ConsoleHandler
-
-.level = WARNING
-
-java.util.logging.ConsoleHandler.level = FINE
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-
-demo.logbrowser.level = FINE
-org.apache.cxf.interceptor.LoggingInInterceptor.level = INFO
-org.apache.cxf.interceptor.LoggingOutInterceptor.level = INFO
http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/distribution/src/main/release/samples/logbrowser/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/logbrowser/pom.xml b/distribution/src/main/release/samples/logbrowser/pom.xml
deleted file mode 100644
index 29c9980..0000000
--- a/distribution/src/main/release/samples/logbrowser/pom.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0"?>
-<!--
- 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>
- <artifactId>logbrowser</artifactId>
- <packaging>war</packaging>
- <name>Apache CXF Samples LogBrowser</name>
- <description>Apacher CXF Samples LogBrowser</description>
- <parent>
- <groupId>org.apache.cxf.samples</groupId>
- <artifactId>cxf-samples</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <!-- excluding libs and classes/META-INF for OSGi -->
- <packagingExcludes>WEB-INF/lib/,WEB-INF/classes/META-INF/</packagingExcludes>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- <extensions>true</extensions>
- <configuration>
- <supportedProjectTypes>
- <supportedProjectType>jar</supportedProjectType>
- <supportedProjectType>bundle</supportedProjectType>
- <supportedProjectType>war</supportedProjectType>
- </supportedProjectTypes>
- <instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Bundle-Description>${project.description}</Bundle-Description>
- <Web-ContextPath>/cxf-samples-logbrowser</Web-ContextPath>
- <Bundle-ClassPath>.,WEB-INF/classes</Bundle-ClassPath>
- <Export-Package />
- <Import-Package>
- org.apache.cxf.jaxrs.servlet,
- org.apache.abdera.parser.stax,
- com.ctc.wstx.stax,
- org.apache.abdera,
- *
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <profiles>
- <profile>
- <id>server</id>
- <build>
- <defaultGoal>test</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>test</phase>
- <goals>
- <goal>java</goal>
- </goals>
- <configuration>
- <mainClass>demo.service.Server</mainClass>
- <systemProperties>
- <systemProperty>
- <key>java.util.logging.config.file</key>
- <value>${basedir}/logging.properties</value>
- </systemProperty>
- </systemProperties>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
- <dependencies>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-management-web</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-extension-search</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.abdera</groupId>
- <artifactId>abdera-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.abdera</groupId>
- <artifactId>abdera-parser</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mime4j-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/distribution/src/main/release/samples/logbrowser/src/main/java/demo/logbrowser/App.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/logbrowser/src/main/java/demo/logbrowser/App.java b/distribution/src/main/release/samples/logbrowser/src/main/java/demo/logbrowser/App.java
deleted file mode 100644
index b262a19..0000000
--- a/distribution/src/main/release/samples/logbrowser/src/main/java/demo/logbrowser/App.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * 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 demo.logbrowser;
-
-import java.util.HashSet;
-import java.util.Set;
-import javax.ws.rs.core.Application;
-
-import org.apache.cxf.jaxrs.provider.atom.AtomEntryProvider;
-import org.apache.cxf.jaxrs.provider.atom.AtomFeedProvider;
-
-import org.apache.cxf.management.web.browser.bootstrapping.BootstrapStorage;
-import org.apache.cxf.management.web.browser.bootstrapping.SimpleXMLSettingsStorage;
-import org.apache.cxf.management.web.logging.atom.AtomPullServer;
-
-public class App extends Application {
-
-
- @Override
- public Set<Object> getSingletons() {
- Set<Object> classes = new HashSet<Object>();
-
- // The log browser
- classes.add(new BootstrapStorage(new SimpleXMLSettingsStorage()));
- classes.add(new BootstrapStorage.StaticFileProvider());
- classes.add(new BootstrapStorage.SettingsProvider());
- // this provider will have to be discovered via the class-scanning
- classes.add(new org.apache.cxf.jaxrs.ext.search.SearchContextProvider());
-
- // The pull server
- AtomPullServer aps = new AtomPullServer();
- aps.setLoggers("demo.service:DEBUG,org.apache.cxf.interceptor:INFO");
- aps.init();
- classes.add(aps);
-
- classes.add(new AtomFeedProvider());
- classes.add(new AtomEntryProvider());
-
- return classes;
- }
-}
http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/distribution/src/main/release/samples/logbrowser/src/main/java/demo/service/App.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/logbrowser/src/main/java/demo/service/App.java b/distribution/src/main/release/samples/logbrowser/src/main/java/demo/service/App.java
deleted file mode 100644
index 58ac502..0000000
--- a/distribution/src/main/release/samples/logbrowser/src/main/java/demo/service/App.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * 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 demo.service;
-
-import java.util.HashSet;
-import java.util.Set;
-import javax.ws.rs.core.Application;
-
-public class App extends Application {
-
- @Override
- public Set<Object> getSingletons() {
- Set<Object> classes = new HashSet<Object>();
-
- classes.add(new CustomerService());
-
- return classes;
- }
-}
http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/distribution/src/main/release/samples/logbrowser/src/main/java/demo/service/CustomerService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/logbrowser/src/main/java/demo/service/CustomerService.java b/distribution/src/main/release/samples/logbrowser/src/main/java/demo/service/CustomerService.java
deleted file mode 100644
index 2fb2038..0000000
--- a/distribution/src/main/release/samples/logbrowser/src/main/java/demo/service/CustomerService.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
- * 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 demo.service;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Response;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.apache.commons.lang.Validate;
-import org.apache.cxf.common.logging.LogUtils;
-
-@Path("/customers/")
-public class CustomerService {
- private static final Logger LOGGER = LogUtils.getL7dLogger(CustomerService.class);
-
- Map<Long, Customer> customers = new HashMap<Long, Customer>();
-
- @GET
- @Path("/{id}/")
- @Produces("application/json")
- public Customer getCustomer(@PathParam("id") final String id) {
- Validate.notNull(id);
- Validate.notEmpty(id);
-
- LOGGER.log(Level.FINE, "Invoking getCustomer, id={0}", id);
-
- Customer customer = customers.get(Long.parseLong(id));
-
- if (customer == null) {
- LOGGER.log(Level.SEVERE, "Specified customer does not exist, id={0}", id);
- }
-
- return customer;
- }
-
- @POST
- @Consumes("application/json")
- public Response updateCustomer(final Customer customer) {
- Validate.notNull(customer);
-
- LOGGER.log(Level.FINE, "Invoking updateCustomer, customer={0}", customer);
-
- if (isCustomerExists(customer)) {
- LOGGER.log(Level.FINE, "Specified customer exists, update data, customer={0}", customer);
- } else {
- LOGGER.log(Level.WARNING, "Specified customer does not exist, add data, customer={0}", customer);
- }
-
- customers.put(customer.getId(), customer);
-
- LOGGER.log(Level.INFO, "Customer was updated successful, customer={0}", customer);
- return Response.ok().build();
- }
-
- @DELETE
- @Path("/{id}/")
- public Response deleteCustomer(@PathParam("id") String id) {
- Validate.notNull(id);
- Validate.notEmpty(id);
-
- LOGGER.log(Level.FINE, "Invoking deleteCustomer, id={0}", id);
-
- long identifier = Long.parseLong(id);
-
- Response response;
-
- if (isCustomerExists(identifier)) {
- LOGGER.log(Level.FINE, "Specified customer exists, remove data, id={0}", id);
- customers.remove(identifier);
- LOGGER.log(Level.INFO, "Customer was removed successful, id={0}", id);
- response = Response.ok().build();
- } else {
- LOGGER.log(Level.SEVERE, "Specified customer does not exist, remove fail, id={0}", id);
- response = Response.notModified().build();
- }
-
- return response;
- }
-
- private boolean isCustomerExists(final Customer customer) {
- return customers.get(customer.getId()) != null;
- }
-
- private boolean isCustomerExists(final long id) {
- return customers.get(id) != null;
- }
-
- @XmlRootElement(name = "Customer")
- public static class Customer {
- private long id;
- private String name;
-
- public long getId() {
- return id;
- }
-
- public void setId(long id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- @Override
- public String toString() {
- return "Customer{id=" + id + ", name='" + name + "'}";
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/distribution/src/main/release/samples/logbrowser/src/main/java/demo/service/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/logbrowser/src/main/java/demo/service/Server.java b/distribution/src/main/release/samples/logbrowser/src/main/java/demo/service/Server.java
deleted file mode 100644
index e5b2fed..0000000
--- a/distribution/src/main/release/samples/logbrowser/src/main/java/demo/service/Server.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * 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 demo.service;
-
-import org.eclipse.jetty.server.Handler;
-import org.eclipse.jetty.server.handler.DefaultHandler;
-import org.eclipse.jetty.server.handler.HandlerCollection;
-import org.eclipse.jetty.webapp.WebAppContext;
-
-public class Server {
-
- protected Server() throws Exception {
- System.out.println("Starting Server");
-
- /**
- * Important: This code simply starts up a servlet container and adds
- * the web application in src/webapp to it. Normally you would be using
- * Jetty or Tomcat and have the webapp packaged as a WAR. This is simply
- * as a convenience so you do not need to configure your servlet
- * container to see CXF in action!
- */
- org.eclipse.jetty.server.Server server = new org.eclipse.jetty.server.Server(9002);
-
-
- WebAppContext webappcontext = new WebAppContext();
- webappcontext.setContextPath("/");
-
- webappcontext.setWar("src/main/webapp");
-
- HandlerCollection handlers = new HandlerCollection();
- handlers.setHandlers(new Handler[] {webappcontext, new DefaultHandler()});
-
- server.setHandler(handlers);
- server.start();
- System.out.println("Server ready...");
- server.join();
- }
-
- public static void main(String args[]) throws Exception {
- new Server();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/distribution/src/main/release/samples/logbrowser/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/logbrowser/src/main/webapp/WEB-INF/web.xml b/distribution/src/main/release/samples/logbrowser/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index eaa0d99..0000000
--- a/distribution/src/main/release/samples/logbrowser/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- 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.
--->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <servlet>
- <display-name>CustomerService</display-name>
- <servlet-name>CustomerService</servlet-name>
- <servlet-class>org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet</servlet-class>
- <init-param>
- <param-name>javax.ws.rs.Application</param-name>
- <param-value>demo.service.App</param-value>
- </init-param>
- <init-param>
- <param-name>jaxrs.inInterceptors</param-name>
- <param-value>
- org.apache.cxf.interceptor.LoggingInInterceptor
- </param-value>
- </init-param>
- <init-param>
- <param-name>jaxrs.outInterceptors</param-name>
- <param-value>
- org.apache.cxf.interceptor.LoggingOutInterceptor
- </param-value>
- </init-param>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet>
- <display-name>BrowserServlet</display-name>
- <servlet-name>BrowserServlet</servlet-name>
- <servlet-class>org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet</servlet-class>
- <init-param>
- <param-name>javax.ws.rs.Application</param-name>
- <param-value>demo.logbrowser.App</param-value>
- </init-param>
- <load-on-startup>2</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>BrowserServlet</servlet-name>
- <url-pattern>/log/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>CustomerService</servlet-name>
- <url-pattern>/service/*</url-pattern>
- </servlet-mapping>
-</web-app>
-<!-- END SNIPPET: webxml -->
http://git-wip-us.apache.org/repos/asf/cxf/blob/7f4a24d0/distribution/src/main/release/samples/logbrowser/src/main/webapp/customer-service.html
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/logbrowser/src/main/webapp/customer-service.html b/distribution/src/main/release/samples/logbrowser/src/main/webapp/customer-service.html
deleted file mode 100644
index 97c2ceb..0000000
--- a/distribution/src/main/release/samples/logbrowser/src/main/webapp/customer-service.html
+++ /dev/null
@@ -1,179 +0,0 @@
-<!--
- ~ 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.
- -->
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
- <title>Customer Service</title>
-
- <style type="text/css">
- label {
- width: 5em;
- float: left;
- text-align: right;
- margin-right: 0.5em;
- display: block;
- }
- .submit a {
- margin-left: 5.5em;
- }
- .submit input {
- margin-left: 8em;
- }
- </style>
-
- <script type="text/javascript" src="./jquery-1.4.2.min.js"></script>
-
- <script type="text/javascript">
-
- var wloc = window.location.pathname;
- wloc = wloc.substring(0, wloc.lastIndexOf('/'));
-
- function buildCustomerAsString(id, name) {
- return "{ \"Customer\" : { \"id\" : \"" + id + "\", \"name\" : \"" + name +"\" } }";
- }
-
- $(document).ready(function() {
- $("#addOrUpdateCustomerButton").click(function() {
- var isError = false;
-
- var id = $("#addOrUpdateCustomerForm INPUT[name='customer.id']").val();
- if (id == null || id == "") {
- alert("Field 'ID' can't be empty");
- isError = true;
- }
-
- var name = $("#addOrUpdateCustomerForm INPUT[name='customer.name']").val();
- if (name == null || name == "") {
- alert("Field 'Name' can't be empty");
- isError = true;
- }
-
- if (isError) {
- return;
- }
-
- $.ajax({
- type: "POST",
- url : wloc + "/service/customers/",
- contentType : "application/json",
- data : buildCustomerAsString(id, name),
- complete : function(xhr) {
- if (xhr.status == 200) {
- alert("Customer added/updated successfully");
- } else {
- alert("Error occurred");
- }
- }
- });
- });
-
- $("#getCustomerButton").click(function() {
- var id = $("#getCustomerForm INPUT[name='customer.id']").val();
- if (id == null || id == "") {
- alert("Field 'ID' can't be empty");
- return;
- }
-
- $.ajax({
- type: "GET",
- url : wloc + "/service/customers/" + id,
- dataType : "text",
- complete : function(xhr) {
- if (xhr.status == 200) {
- alert(xhr.responseText);
- } else if (xhr.status == 204) {
- alert("Customer, with specified ID, doesn't exist");
- } else {
- alert("Error occurred");
- }
- }
- });
- });
-
- $("#deleteCustomerButton").click(function() {
- var id = $("#deleteCustomerForm INPUT[name='customer.id']").val();
- if (id == null || id == "") {
- alert("Field 'ID' can't be empty");
- return;
- }
-
- $.ajax({
- type: "DELETE",
- url : wloc + "/service/customers/" + id,
- complete : function(xhr) {
- if (xhr.status == 200) {
- alert("Customer deleted successfully");
- } else if (xhr.status == 304) {
- alert("Customer, with specified ID, doesn't exist");
- } else {
- alert("Error occurred");
- }
- }
- });
- });
-
- $("INPUT.digits").keyup(function () {
- this.value = this.value.replace(/[^0-9\.]/g,'');
- });
- });
- </script>
-</head>
-<body>
-
-<div>
- <h1>Customer Service</h1>
-
- <h2>Add or update customer</h2>
- <form id="addOrUpdateCustomerForm" action="#">
- <p>
- <label>ID:</label>
- <input name="customer.id" class="digits" type="text" size="3"/>
- </p>
-
- <p>
- <label>Name:</label>
- <input name="customer.name" type="text" size="30"/>
- </p>
-
- <p class="submit"><a id="addOrUpdateCustomerButton" href="#">Add or Update</a></p>
- </form>
-
- <h2>Get customer</h2>
- <form id="getCustomerForm" action="#">
- <p>
- <label>ID:</label>
- <input name="customer.id" class="digits" type="text" size="3"/>
- </p>
-
- <p class="submit"><a id="getCustomerButton" href="#">Get</a></p>
- </form>
-
- <h2>Delete customer</h2>
- <form id="deleteCustomerForm" action="#">
- <p>
- <label>ID:</label>
- <input name="customer.id" class="digits" type="text" size="3"/>
- </p>
-
- <p class="submit"><a id="deleteCustomerButton" href="#">Delete</a></p>
- </form>
-</div>
-</body>
-</html>