You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by ps...@apache.org on 2009/05/01 00:33:05 UTC
svn commit: r770476 - in /labs/pinpoint/trunk: ./ pinpoint-rest/
pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/
pinpoint-rest/src/main/java/org/apache/logging/pinpoint/rest/
pinpoint-service/ pinpoint-swing/ pinpoint-web/ pinpoint-web/sr...
Author: psmith
Date: Thu Apr 30 22:33:05 2009
New Revision: 770476
URL: http://svn.apache.org/viewvc?rev=770476&view=rev
Log:
Removed Swing & Web modules, and relocated a few JSON related items into pinpoint-rest.
Pinpoint will just provide a basic RESTful API for access. GUI's built outside of Pinpoint can then us it as they see fit.
Fixed up some dependency declarations that prevented it from being built on the command line (inexplicably it was compiling fine in Eclipse).
Added:
labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/
- copied from r691474, labs/pinpoint/trunk/pinpoint-web/src/main/java/org/apache/logging/pinpoint/web/json/
Removed:
labs/pinpoint/trunk/pinpoint-swing/
labs/pinpoint/trunk/pinpoint-web/pom.xml
labs/pinpoint/trunk/pinpoint-web/src/main/java/org/apache/logging/pinpoint/PinpointContextEditor.java
labs/pinpoint/trunk/pinpoint-web/src/main/java/org/apache/logging/pinpoint/PinpointContextEditorRegistrar.java
labs/pinpoint/trunk/pinpoint-web/src/main/java/org/apache/logging/pinpoint/web/AbstractPinpointResultController.java
labs/pinpoint/trunk/pinpoint-web/src/main/java/org/apache/logging/pinpoint/web/PinpointEventContextViewRequest.java
labs/pinpoint/trunk/pinpoint-web/src/main/java/org/apache/logging/pinpoint/web/PinpointSearchContextController.java
labs/pinpoint/trunk/pinpoint-web/src/main/java/org/apache/logging/pinpoint/web/PinpointSearchResultContextViewController.java
labs/pinpoint/trunk/pinpoint-web/src/main/java/org/apache/logging/pinpoint/web/PinpointSearchResultsNavigator.java
labs/pinpoint/trunk/pinpoint-web/src/main/java/org/apache/logging/pinpoint/web/PinpointSearcherEhCacheRegionFactory.java
labs/pinpoint/trunk/pinpoint-web/src/main/java/org/apache/logging/pinpoint/web/json/
labs/pinpoint/trunk/pinpoint-web/src/main/resources/
labs/pinpoint/trunk/pinpoint-web/src/test/
Modified:
labs/pinpoint/trunk/pinpoint-rest/ (props changed)
labs/pinpoint/trunk/pinpoint-rest/pom.xml
labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/JSONUtils.java
labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/PinpointJSONConfigFactory.java
labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/PinpointJSONContextLister.java
labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/PinpointJSONContextPropertyLister.java
labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/PinpointJSONSearchResultStreamer.java
labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/PinpointSearchResultPaginationRequest.java
labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/rest/Startup.java
labs/pinpoint/trunk/pinpoint-service/pom.xml
labs/pinpoint/trunk/pom.xml
Propchange: labs/pinpoint/trunk/pinpoint-rest/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Apr 30 22:33:05 2009
@@ -0,0 +1 @@
+target
Modified: labs/pinpoint/trunk/pinpoint-rest/pom.xml
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-rest/pom.xml?rev=770476&r1=770475&r2=770476&view=diff
==============================================================================
--- labs/pinpoint/trunk/pinpoint-rest/pom.xml (original)
+++ labs/pinpoint/trunk/pinpoint-rest/pom.xml Thu Apr 30 22:33:05 2009
@@ -20,5 +20,26 @@
<artifactId>pinpoint-core</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.noelios.restlet</groupId>
+ <artifactId>com.noelios.restlet</artifactId>
+ <version>${restlet.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.json-lib</groupId>
+ <artifactId>json-lib</artifactId>
+ <version>${json-lib.version}</version>
+ <classifier>jdk15</classifier>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.json-lib</groupId>
+ <artifactId>json-lib-ext-spring</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging</groupId>
+ <artifactId>pinpoint-service</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/JSONUtils.java
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/JSONUtils.java?rev=770476&r1=691474&r2=770476&view=diff
==============================================================================
--- labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/JSONUtils.java (original)
+++ labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/JSONUtils.java Thu Apr 30 22:33:05 2009
@@ -1,4 +1,4 @@
-package org.apache.logging.pinpoint.web.json;
+package org.apache.logging.pinpoint.json;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
Modified: labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/PinpointJSONConfigFactory.java
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/PinpointJSONConfigFactory.java?rev=770476&r1=691474&r2=770476&view=diff
==============================================================================
--- labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/PinpointJSONConfigFactory.java (original)
+++ labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/PinpointJSONConfigFactory.java Thu Apr 30 22:33:05 2009
@@ -1,4 +1,4 @@
-package org.apache.logging.pinpoint.web.json;
+package org.apache.logging.pinpoint.json;
import java.text.DateFormat;
import java.util.Date;
@@ -14,7 +14,7 @@
public class PinpointJSONConfigFactory implements FactoryBean {
- private DateFormat dtf = ISO8601DateFormat.getDateTimeInstance();
+ private final DateFormat dtf = ISO8601DateFormat.getDateTimeInstance();
public Object getObject() throws Exception {
JsonConfig config = new JsonConfig();
Modified: labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/PinpointJSONContextLister.java
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/PinpointJSONContextLister.java?rev=770476&r1=691474&r2=770476&view=diff
==============================================================================
--- labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/PinpointJSONContextLister.java (original)
+++ labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/PinpointJSONContextLister.java Thu Apr 30 22:33:05 2009
@@ -1,4 +1,4 @@
-package org.apache.logging.pinpoint.web.json;
+package org.apache.logging.pinpoint.json;
import java.util.List;
Modified: labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/PinpointJSONContextPropertyLister.java
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/PinpointJSONContextPropertyLister.java?rev=770476&r1=691474&r2=770476&view=diff
==============================================================================
--- labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/PinpointJSONContextPropertyLister.java (original)
+++ labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/PinpointJSONContextPropertyLister.java Thu Apr 30 22:33:05 2009
@@ -1,4 +1,4 @@
-package org.apache.logging.pinpoint.web.json;
+package org.apache.logging.pinpoint.json;
import java.util.Collection;
Modified: labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/PinpointJSONSearchResultStreamer.java
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/PinpointJSONSearchResultStreamer.java?rev=770476&r1=691474&r2=770476&view=diff
==============================================================================
--- labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/PinpointJSONSearchResultStreamer.java (original)
+++ labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/PinpointJSONSearchResultStreamer.java Thu Apr 30 22:33:05 2009
@@ -1,4 +1,4 @@
-package org.apache.logging.pinpoint.web.json;
+package org.apache.logging.pinpoint.json;
import java.util.List;
Modified: labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/PinpointSearchResultPaginationRequest.java
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/PinpointSearchResultPaginationRequest.java?rev=770476&r1=691474&r2=770476&view=diff
==============================================================================
--- labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/PinpointSearchResultPaginationRequest.java (original)
+++ labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/json/PinpointSearchResultPaginationRequest.java Thu Apr 30 22:33:05 2009
@@ -1,4 +1,4 @@
-package org.apache.logging.pinpoint.web.json;
+package org.apache.logging.pinpoint.json;
public class PinpointSearchResultPaginationRequest {
Modified: labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/rest/Startup.java
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/rest/Startup.java?rev=770476&r1=770475&r2=770476&view=diff
==============================================================================
--- labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/rest/Startup.java (original)
+++ labs/pinpoint/trunk/pinpoint-rest/src/main/java/org/apache/logging/pinpoint/rest/Startup.java Thu Apr 30 22:33:05 2009
@@ -3,7 +3,7 @@
import net.sf.json.JsonConfig;
import org.apache.logging.pinpoint.PinpointHome;
-import org.apache.logging.pinpoint.web.json.PinpointJSONConfigFactory;
+import org.apache.logging.pinpoint.json.PinpointJSONConfigFactory;
import org.restlet.Component;
public class Startup {
Modified: labs/pinpoint/trunk/pinpoint-service/pom.xml
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-service/pom.xml?rev=770476&r1=770475&r2=770476&view=diff
==============================================================================
--- labs/pinpoint/trunk/pinpoint-service/pom.xml (original)
+++ labs/pinpoint/trunk/pinpoint-service/pom.xml Thu Apr 30 22:33:05 2009
@@ -137,17 +137,17 @@
<dependency>
<groupId>org.restlet</groupId>
<artifactId>org.restlet</artifactId>
- <version>1.0.1</version>
+ <version>${restlet.version}</version>
</dependency>
<dependency>
<groupId>com.noelios.restlet</groupId>
<artifactId>com.noelios.restlet</artifactId>
- <version>1.0.1</version>
+ <version>${restlet.version}</version>
</dependency>
<dependency>
<groupId>com.noelios.restlet</groupId>
<artifactId>com.noelios.restlet.ext.simple</artifactId>
- <version>1.0.1</version>
+ <version>${restlet.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
Modified: labs/pinpoint/trunk/pom.xml
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pom.xml?rev=770476&r1=770475&r2=770476&view=diff
==============================================================================
--- labs/pinpoint/trunk/pom.xml (original)
+++ labs/pinpoint/trunk/pom.xml Thu Apr 30 22:33:05 2009
@@ -45,7 +45,8 @@
<derby.version>10.2.2.0</derby.version>
<json-lib.version>2.2.1</json-lib.version>
<junit.version>3.8.2</junit.version>
- </properties>
+ <restlet.version>1.0.1</restlet.version>
+ </properties>
<repositories>
<!-- This repository is used to host log4j related snapshots required by Pinpoint until they are released -->
<repository>
@@ -76,9 +77,7 @@
<module>pinpoint-service</module>
<module>pinpoint-metric</module>
<module>pinpoint-loadgenerator</module>
- <module>pinpoint-web</module>
<module>pinpoint-reports</module>
- <module>pinpoint-swing</module>
<module>pinpoint-service-appender</module>
<module>pinpoint-rest</module>
</modules>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org