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 2007/08/29 06:53:49 UTC
svn commit: r570637 - in /labs/pinpoint/trunk: ./
pinpoint-core/src/main/java/org/apache/logging/pinpoint/
pinpoint-service/src/main/java/org/apache/logging/pinpoint/restlet/
pinpoint-service/src/main/java/org/apache/logging/pinpoint/service/
pinpoint-...
Author: psmith
Date: Tue Aug 28 21:53:47 2007
New Revision: 570637
URL: http://svn.apache.org/viewvc?rev=570637&view=rev
Log:
* Fixed up JMX port stuff. Must have been on crack at some point.
* Refactored some spring configuration so that the new Web module can share some details.
* Added basic Spring-based Web module. (Does nothing. Actually less than nothing.)
Added:
labs/pinpoint/trunk/pinpoint-service/src/main/resources/org/apache/logging/pinpoint/service/pinpoint-service.xml
labs/pinpoint/trunk/pinpoint-web/src/main/resources/
labs/pinpoint/trunk/pinpoint-web/src/main/webapp/
labs/pinpoint/trunk/pinpoint-web/src/main/webapp/WEB-INF/
labs/pinpoint/trunk/pinpoint-web/src/main/webapp/WEB-INF/dispatcher-servlet.xml
labs/pinpoint/trunk/pinpoint-web/src/main/webapp/WEB-INF/spring/
labs/pinpoint/trunk/pinpoint-web/src/main/webapp/WEB-INF/spring/rootWebContext.xml
labs/pinpoint/trunk/pinpoint-web/src/main/webapp/WEB-INF/web.xml
Modified:
labs/pinpoint/trunk/TODO.txt
labs/pinpoint/trunk/pinpoint-core/src/main/java/org/apache/logging/pinpoint/PinpointHome.java
labs/pinpoint/trunk/pinpoint-service/src/main/java/org/apache/logging/pinpoint/restlet/PinpointRestletApplication.java
labs/pinpoint/trunk/pinpoint-service/src/main/java/org/apache/logging/pinpoint/service/Service.java
labs/pinpoint/trunk/pinpoint-service/src/main/resources/log4j.properties
labs/pinpoint/trunk/pinpoint-service/src/main/resources/org/apache/logging/pinpoint/service/default-receiver-config.xml
labs/pinpoint/trunk/pinpoint-service/src/main/resources/org/apache/logging/pinpoint/service/jmx.xml
labs/pinpoint/trunk/pinpoint-service/src/main/resources/org/apache/logging/pinpoint/service/pinpoint-context.xml
labs/pinpoint/trunk/pinpoint-service/src/main/resources/org/apache/logging/pinpoint/service/properties.xml
labs/pinpoint/trunk/pinpoint-service/src/main/resources/org/apache/logging/pinpoint/service/restlet.xml
labs/pinpoint/trunk/pinpoint-web/pom.xml
labs/pinpoint/trunk/pom.xml
Modified: labs/pinpoint/trunk/TODO.txt
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/TODO.txt?rev=570637&r1=570636&r2=570637&view=diff
==============================================================================
--- labs/pinpoint/trunk/TODO.txt (original)
+++ labs/pinpoint/trunk/TODO.txt Tue Aug 28 21:53:47 2007
@@ -25,4 +25,15 @@
pinpoint-graphs
* create the module for a start!
-* Be able to generate a 'timeline' graph similar to Fisheye that shows volume of events based on time of a seach result. This will require setting up a registration setup to register HitCollectors (or equivalent) to scan the returning results to build up that model.
\ No newline at end of file
+* Be able to generate a 'timeline' graph similar to Fisheye that shows volume of events based on time of a seach result. This will require setting up a registration setup to register HitCollectors (or equivalent) to scan the returning results to build up that model.
+
+
+Extra-nice features
+
+* Ability to scan through a search results for the next page that contains an ERROR/WARN etc (probably don't need INFO/DEBUG...')
+
+* Processing of Apache log files? Interesting to see if they are big/small in size of LoggingEvent and index
+
+* Consider using GzipOutputStream for encoding the binary data? Might not make a massive difference in size but add CPU averhead. Configuration choice?
+
+* extractor that can extract a time range from a context quickly into Excel. (Useful for Emma and the other triagee's')
Modified: labs/pinpoint/trunk/pinpoint-core/src/main/java/org/apache/logging/pinpoint/PinpointHome.java
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-core/src/main/java/org/apache/logging/pinpoint/PinpointHome.java?rev=570637&r1=570636&r2=570637&view=diff
==============================================================================
--- labs/pinpoint/trunk/pinpoint-core/src/main/java/org/apache/logging/pinpoint/PinpointHome.java (original)
+++ labs/pinpoint/trunk/pinpoint-core/src/main/java/org/apache/logging/pinpoint/PinpointHome.java Tue Aug 28 21:53:47 2007
@@ -26,25 +26,27 @@
@ManagedResource(description = "The root of the Pinpoint system. All PinpointContexts are created under this.")
public class PinpointHome {
- private static final Logger LOG = PinpointUtils
- .getLogger(PinpointHome.class);
+ private static final Logger LOG = PinpointUtils.getLogger(PinpointHome.class);
private final File pinpointHome;
+ public PinpointHome(String pinpointHome) {
+ this(new File(pinpointHome));
+ }
+
public PinpointHome(File pinpointHome) {
if (pinpointHome.exists() && !pinpointHome.isDirectory()) {
- throw new IllegalStateException(pinpointHome.getAbsolutePath() +
- " exists, but is not a directory");
+ throw new IllegalStateException(pinpointHome.getAbsolutePath()
+ + " exists, but is not a directory");
}
this.pinpointHome = pinpointHome;
if (!pinpointHome.exists()) {
- LOG.info("Pinpoint Home '" + pinpointHome.getAbsolutePath() +
- "' does not exist, creating...");
+ LOG.info("Pinpoint Home '" + pinpointHome.getAbsolutePath()
+ + "' does not exist, creating...");
if (!pinpointHome.mkdirs()) {
- throw new IllegalStateException(
- "Failed to create Pinpoint home @ '" +
- pinpointHome.getAbsolutePath() + "'");
+ throw new IllegalStateException("Failed to create Pinpoint home @ '"
+ + pinpointHome.getAbsolutePath() + "'");
}
}
}
@@ -58,13 +60,10 @@
}
public List<PinpointContext> listContexts() {
- Collection<File> listFiles = FileUtils.listFiles(pinpointHome,
- FileFilterUtils.trueFileFilter(), FileFilterUtils
- .andFileFilter(
- FileFilterUtils.prefixFileFilter("ctx."),
- FileFilterUtils.directoryFileFilter()));
- List<PinpointContext> ctxs = new ArrayList<PinpointContext>(listFiles
- .size());
+ Collection<File> listFiles = FileUtils.listFiles(pinpointHome, FileFilterUtils
+ .trueFileFilter(), FileFilterUtils.andFileFilter(FileFilterUtils
+ .prefixFileFilter("ctx."), FileFilterUtils.directoryFileFilter()));
+ List<PinpointContext> ctxs = new ArrayList<PinpointContext>(listFiles.size());
for (File file : listFiles) {
ctxs.add(PinpointContext.create(this, file.getName()));
}
Modified: labs/pinpoint/trunk/pinpoint-service/src/main/java/org/apache/logging/pinpoint/restlet/PinpointRestletApplication.java
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-service/src/main/java/org/apache/logging/pinpoint/restlet/PinpointRestletApplication.java?rev=570637&r1=570636&r2=570637&view=diff
==============================================================================
--- labs/pinpoint/trunk/pinpoint-service/src/main/java/org/apache/logging/pinpoint/restlet/PinpointRestletApplication.java (original)
+++ labs/pinpoint/trunk/pinpoint-service/src/main/java/org/apache/logging/pinpoint/restlet/PinpointRestletApplication.java Tue Aug 28 21:53:47 2007
@@ -12,6 +12,7 @@
private final Component component;
private final Restlet backlogGraphRestlet;
private final Restlet rootRestlet;
+ private int port = 8182;
public PinpointRestletApplication(Component component, Restlet rootRestlet,
PinpointGraphRestlet pinpointGraphRestlet, BacklogGraphReslet backlogGraphRestlet) {
@@ -34,7 +35,7 @@
}
public void go() {
- component.getServers().add(Protocol.HTTP, 8182);
+ component.getServers().add(Protocol.HTTP, port);
component.getDefaultHost().attach("", this);
component.getClients().add(Protocol.FILE);
try {
@@ -42,6 +43,14 @@
} catch (Exception e) {
throw new RuntimeException("Failed to start Restlet Component", e);
}
+ }
+
+ public final int getPort() {
+ return port;
+ }
+
+ public final void setPort(int port) {
+ this.port = port;
}
}
Modified: labs/pinpoint/trunk/pinpoint-service/src/main/java/org/apache/logging/pinpoint/service/Service.java
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-service/src/main/java/org/apache/logging/pinpoint/service/Service.java?rev=570637&r1=570636&r2=570637&view=diff
==============================================================================
--- labs/pinpoint/trunk/pinpoint-service/src/main/java/org/apache/logging/pinpoint/service/Service.java (original)
+++ labs/pinpoint/trunk/pinpoint-service/src/main/java/org/apache/logging/pinpoint/service/Service.java Tue Aug 28 21:53:47 2007
@@ -80,7 +80,7 @@
System.setProperty("log4j.debug", "true");
this.configs = new String[] { "logger-repository.xml", "amq.xml", "jmx.xml", "restlet.xml",
- "properties.xml", "pinpoint-context.xml", config };
+ "properties.xml", "pinpoint-context.xml", "pinpoint-service.xml", config };
}
Modified: labs/pinpoint/trunk/pinpoint-service/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-service/src/main/resources/log4j.properties?rev=570637&r1=570636&r2=570637&view=diff
==============================================================================
--- labs/pinpoint/trunk/pinpoint-service/src/main/resources/log4j.properties (original)
+++ labs/pinpoint/trunk/pinpoint-service/src/main/resources/log4j.properties Tue Aug 28 21:53:47 2007
@@ -1,4 +1,6 @@
log4j.rootCategory=INFO, console
log4j.appender.console=org.apache.log4j.ConsoleAppender
log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=[%d{ISO8601} %-5p][%20.20c][%t] %m%n
\ No newline at end of file
+log4j.appender.console.layout.ConversionPattern=[%d{ISO8601} %-5p][%20.20c][%t] %m%n
+
+log4j.logger.com.noelio=WARN
\ No newline at end of file
Modified: labs/pinpoint/trunk/pinpoint-service/src/main/resources/org/apache/logging/pinpoint/service/default-receiver-config.xml
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-service/src/main/resources/org/apache/logging/pinpoint/service/default-receiver-config.xml?rev=570637&r1=570636&r2=570637&view=diff
==============================================================================
--- labs/pinpoint/trunk/pinpoint-service/src/main/resources/org/apache/logging/pinpoint/service/default-receiver-config.xml (original)
+++ labs/pinpoint/trunk/pinpoint-service/src/main/resources/org/apache/logging/pinpoint/service/default-receiver-config.xml Tue Aug 28 21:53:47 2007
@@ -28,4 +28,5 @@
<property name="port" value="4560" />
</bean>
+
</beans>
Modified: labs/pinpoint/trunk/pinpoint-service/src/main/resources/org/apache/logging/pinpoint/service/jmx.xml
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-service/src/main/resources/org/apache/logging/pinpoint/service/jmx.xml?rev=570637&r1=570636&r2=570637&view=diff
==============================================================================
--- labs/pinpoint/trunk/pinpoint-service/src/main/resources/org/apache/logging/pinpoint/service/jmx.xml (original)
+++ labs/pinpoint/trunk/pinpoint-service/src/main/resources/org/apache/logging/pinpoint/service/jmx.xml Tue Aug 28 21:53:47 2007
@@ -29,14 +29,14 @@
<bean id="serverConnector" class="org.springframework.jmx.support.ConnectorServerFactoryBean">
<property name="objectName" value="connector:name=rmi"/>
- <property name="serviceUrl" value="service:jmx:rmi://localhost/jndi/rmi://localhost:${pinpoint.jmx.port}/myconnector"/>
+ <property name="serviceUrl" value="service:jmx:rmi://localhost/jndi/rmi://localhost:${pinpoint.rmi.port}/myconnector"/>
<property name="daemon" value="true" />
<property name="threaded" value="true" />
<property name="server" ref="mbeanServerFactory" />
</bean>
<bean id="registry" class="org.springframework.remoting.rmi.RmiRegistryFactoryBean">
- <property name="port" value="pinpoint.rmi.port"/>
+ <property name="port" value="${pinpoint.rmi.port}"/>
</bean>
</beans>
Modified: labs/pinpoint/trunk/pinpoint-service/src/main/resources/org/apache/logging/pinpoint/service/pinpoint-context.xml
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-service/src/main/resources/org/apache/logging/pinpoint/service/pinpoint-context.xml?rev=570637&r1=570636&r2=570637&view=diff
==============================================================================
--- labs/pinpoint/trunk/pinpoint-service/src/main/resources/org/apache/logging/pinpoint/service/pinpoint-context.xml (original)
+++ labs/pinpoint/trunk/pinpoint-service/src/main/resources/org/apache/logging/pinpoint/service/pinpoint-context.xml Tue Aug 28 21:53:47 2007
@@ -30,59 +30,5 @@
<bean id="contextSelector" class="org.apache.logging.pinpoint.selector.StandardPinpointContextSelector">
<constructor-arg ref="pinpointHome" />
</bean>
-
- <bean id="indexWriterFactory" class="org.apache.logging.pinpoint.converter.DefaultIndexWriterFactory" />
-
- <bean id="analyserFactory" class="org.apache.logging.pinpoint.analyser.DefaultAnalyzerFactory" />
-
- <bean id="messageListener" class="org.apache.logging.pinpoint.jms.BufferedLoggingEventJMSMessageListener">
- <constructor-arg ref="eventWriterloggingEventHandler" />
- </bean>
-
- <bean id="listenerContainer" class="org.springframework.jms.listener.DefaultMessageListenerContainer">
- <property name="connectionFactory" ref="jmsFactory" />
- <property name="destination" ref="destination" />
- <property name="messageListener" ref="messageListener" />
- </bean>
-
- <bean id="eventWriterloggingEventHandler" class="org.apache.logging.pinpoint.converter.PinpointEventWriterHandler">
- <meta key="jmxObjectName" value="Pinpoint:name=eventWriterLoggingEventHandler" />
- <constructor-arg ref="contextSelector" />
- <constructor-arg ref="indexWriterFactory" />
- <constructor-arg ref="analyserFactory" />
- <constructor-arg ref="eventsWrittenCounter" />
- <property name="ignoredProperties" value="${pinpoint.ignoredProperties}" />
- </bean>
-
- <bean id="receivedEventsCounter" class="org.apache.logging.pinpoint.metric.Counter" >
- <meta key="jmxObjectName" value="Pinpoint:type=Metrics,name=receivedEventsCounter" />
- <constructor-arg value="Number of Received Events" />
- </bean>
-
- <bean id="eventsWrittenCounter" class="org.apache.logging.pinpoint.metric.Counter" >
- <meta key="jmxObjectName" value="Pinpoint:type=Metrics,name=indexedEventsCounter" />
- <constructor-arg value="Number of Indexed Events" />
- </bean>
-
- <bean id="metricRegistry" class="org.apache.logging.pinpoint.metric.MetricRegistry" init-method="start" >
- <meta key="jmxObjectName" value="Pinpoint:type=Metrics,name=MetricRegistry" />
- <constructor-arg value="5" />
- <property name="counters">
- <list>
- <ref bean="receivedEventsCounter" />
- <ref bean="eventsWrittenCounter" />
- </list>
- </property>
- </bean>
-
- <bean id="loggingEventHandler" class="org.apache.logging.pinpoint.jms.BufferedJMSLoggingEventHandler">
- <constructor-arg ref="jmsTemplate" />
- <constructor-arg ref="receivedEventsCounter" />
- </bean>
-
- <bean id="pinpointAppender" class="org.apache.logging.pinpoint.converter.PinpointAppender" init-method="activateOptions">
- <constructor-arg ref="rootLogger" />
- <constructor-arg ref="loggingEventHandler" />
- </bean>
</beans>
Added: labs/pinpoint/trunk/pinpoint-service/src/main/resources/org/apache/logging/pinpoint/service/pinpoint-service.xml
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-service/src/main/resources/org/apache/logging/pinpoint/service/pinpoint-service.xml?rev=570637&view=auto
==============================================================================
--- labs/pinpoint/trunk/pinpoint-service/src/main/resources/org/apache/logging/pinpoint/service/pinpoint-service.xml (added)
+++ labs/pinpoint/trunk/pinpoint-service/src/main/resources/org/apache/logging/pinpoint/service/pinpoint-service.xml Tue Aug 28 21:53:47 2007
@@ -0,0 +1,80 @@
+<!--
+ 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.
+
+-->
+<beans
+ xmlns="http://www.springframework.org/schema/beans"
+ xmlns:amq="http://activemq.org/config/1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://activemq.org/config/1.0 http://people.apache.org/repository/org.apache.activemq/xsds/activemq-core-4.1-SNAPSHOT.xsd">
+
+
+ <bean id="indexWriterFactory" class="org.apache.logging.pinpoint.converter.DefaultIndexWriterFactory" />
+
+ <bean id="analyserFactory" class="org.apache.logging.pinpoint.analyser.DefaultAnalyzerFactory" />
+
+ <bean id="messageListener" class="org.apache.logging.pinpoint.jms.BufferedLoggingEventJMSMessageListener">
+ <constructor-arg ref="eventWriterloggingEventHandler" />
+ </bean>
+
+
+ <bean id="listenerContainer" class="org.springframework.jms.listener.DefaultMessageListenerContainer">
+ <property name="connectionFactory" ref="jmsFactory" />
+ <property name="destination" ref="destination" />
+ <property name="messageListener" ref="messageListener" />
+ </bean>
+
+ <bean id="eventWriterloggingEventHandler" class="org.apache.logging.pinpoint.converter.PinpointEventWriterHandler">
+ <meta key="jmxObjectName" value="Pinpoint:name=eventWriterLoggingEventHandler" />
+ <constructor-arg ref="contextSelector" />
+ <constructor-arg ref="indexWriterFactory" />
+ <constructor-arg ref="analyserFactory" />
+ <constructor-arg ref="eventsWrittenCounter" />
+ <property name="ignoredProperties" value="${pinpoint.ignoredProperties}" />
+ </bean>
+
+ <bean id="receivedEventsCounter" class="org.apache.logging.pinpoint.metric.Counter" >
+ <meta key="jmxObjectName" value="Pinpoint:type=Metrics,name=receivedEventsCounter" />
+ <constructor-arg value="Number of Received Events" />
+ </bean>
+
+ <bean id="eventsWrittenCounter" class="org.apache.logging.pinpoint.metric.Counter" >
+ <meta key="jmxObjectName" value="Pinpoint:type=Metrics,name=indexedEventsCounter" />
+ <constructor-arg value="Number of Indexed Events" />
+ </bean>
+
+ <bean id="metricRegistry" class="org.apache.logging.pinpoint.metric.MetricRegistry" init-method="start" >
+ <meta key="jmxObjectName" value="Pinpoint:type=Metrics,name=MetricRegistry" />
+ <constructor-arg value="5" />
+ <property name="counters">
+ <list>
+ <ref bean="receivedEventsCounter" />
+ <ref bean="eventsWrittenCounter" />
+ </list>
+ </property>
+ </bean>
+
+ <bean id="loggingEventHandler" class="org.apache.logging.pinpoint.jms.BufferedJMSLoggingEventHandler">
+ <constructor-arg ref="jmsTemplate" />
+ <constructor-arg ref="receivedEventsCounter" />
+ </bean>
+
+ <bean id="pinpointAppender" class="org.apache.logging.pinpoint.converter.PinpointAppender" init-method="activateOptions">
+ <constructor-arg ref="rootLogger" />
+ <constructor-arg ref="loggingEventHandler" />
+ </bean>
+ </beans>
\ No newline at end of file
Modified: labs/pinpoint/trunk/pinpoint-service/src/main/resources/org/apache/logging/pinpoint/service/properties.xml
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-service/src/main/resources/org/apache/logging/pinpoint/service/properties.xml?rev=570637&r1=570636&r2=570637&view=diff
==============================================================================
--- labs/pinpoint/trunk/pinpoint-service/src/main/resources/org/apache/logging/pinpoint/service/properties.xml (original)
+++ labs/pinpoint/trunk/pinpoint-service/src/main/resources/org/apache/logging/pinpoint/service/properties.xml Tue Aug 28 21:53:47 2007
@@ -18,6 +18,8 @@
<prop key="pinpoint.ignoredProperties"></prop>
<prop key="pinpoint.jmx.port">6767</prop>
<prop key="pinpoint.rmi.port">1099</prop>
+ <prop key="pinpoint.graph.port">8182</prop>
+
</props>
</property>
Modified: labs/pinpoint/trunk/pinpoint-service/src/main/resources/org/apache/logging/pinpoint/service/restlet.xml
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-service/src/main/resources/org/apache/logging/pinpoint/service/restlet.xml?rev=570637&r1=570636&r2=570637&view=diff
==============================================================================
--- labs/pinpoint/trunk/pinpoint-service/src/main/resources/org/apache/logging/pinpoint/service/restlet.xml (original)
+++ labs/pinpoint/trunk/pinpoint-service/src/main/resources/org/apache/logging/pinpoint/service/restlet.xml Tue Aug 28 21:53:47 2007
@@ -27,6 +27,7 @@
<constructor-arg ref="rootRestlet" />
<constructor-arg ref="pinpointGraphRestlet" />
<constructor-arg ref="backlogGraphRestlet" />
+ <property name="port" value="${pinpoint.graph.port}" />
</bean>
<bean id="pinpointGraphRestlet" class="org.apache.logging.pinpoint.restlet.PinpointGraphRestlet" >
Modified: labs/pinpoint/trunk/pinpoint-web/pom.xml
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-web/pom.xml?rev=570637&r1=570636&r2=570637&view=diff
==============================================================================
--- labs/pinpoint/trunk/pinpoint-web/pom.xml (original)
+++ labs/pinpoint/trunk/pinpoint-web/pom.xml Tue Aug 28 21:53:47 2007
@@ -1,7 +1,9 @@
-<?xml version="1.0"?><project>
+<?xml version="1.0"?>
+<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.logging</groupId>
<artifactId>pinpoint-web</artifactId>
+ <packaging>war</packaging>
<name>Pinpoint Web-tier</name>
<version>1.0-SNAPSHOT</version>
<url>http://maven.apache.org</url>
@@ -10,6 +12,14 @@
<groupId>org.apache.logging</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -17,5 +27,20 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ <version>2.0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging</groupId>
+ <artifactId>pinpoint-search</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging</groupId>
+ <artifactId>pinpoint-service</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Added: labs/pinpoint/trunk/pinpoint-web/src/main/webapp/WEB-INF/dispatcher-servlet.xml
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-web/src/main/webapp/WEB-INF/dispatcher-servlet.xml?rev=570637&view=auto
==============================================================================
--- labs/pinpoint/trunk/pinpoint-web/src/main/webapp/WEB-INF/dispatcher-servlet.xml (added)
+++ labs/pinpoint/trunk/pinpoint-web/src/main/webapp/WEB-INF/dispatcher-servlet.xml Tue Aug 28 21:53:47 2007
@@ -0,0 +1,20 @@
+<?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.
+
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd ">
+</beans>
Added: labs/pinpoint/trunk/pinpoint-web/src/main/webapp/WEB-INF/spring/rootWebContext.xml
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-web/src/main/webapp/WEB-INF/spring/rootWebContext.xml?rev=570637&view=auto
==============================================================================
--- labs/pinpoint/trunk/pinpoint-web/src/main/webapp/WEB-INF/spring/rootWebContext.xml (added)
+++ labs/pinpoint/trunk/pinpoint-web/src/main/webapp/WEB-INF/spring/rootWebContext.xml Tue Aug 28 21:53:47 2007
@@ -0,0 +1,20 @@
+<?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.
+
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd ">
+</beans>
Added: labs/pinpoint/trunk/pinpoint-web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-web/src/main/webapp/WEB-INF/web.xml?rev=570637&view=auto
==============================================================================
--- labs/pinpoint/trunk/pinpoint-web/src/main/webapp/WEB-INF/web.xml (added)
+++ labs/pinpoint/trunk/pinpoint-web/src/main/webapp/WEB-INF/web.xml Tue Aug 28 21:53:47 2007
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<web-app>
+ <servlet>
+ <servlet-name>dispatcher</servlet-name>
+ <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>dispatcher</servlet-name>
+ <url-pattern>*.form</url-pattern>
+ </servlet-mapping>
+ <context-param>
+ <param-name>contextConfigLocation</param-name>
+ <param-value>
+ /WEB-INF/spring/rootWebContext.xml
+ classpath:org/apache/logging/pinpoint/service/pinpoint-context.xml
+ classpath:org/apache/logging/pinpoint/service/properties.xml
+ </param-value>
+ </context-param>
+ <listener>
+ <listener-class>
+ org.springframework.web.context.ContextLoaderListener
+ </listener-class>
+ </listener>
+</web-app>
Modified: labs/pinpoint/trunk/pom.xml
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pom.xml?rev=570637&r1=570636&r2=570637&view=diff
==============================================================================
--- labs/pinpoint/trunk/pom.xml (original)
+++ labs/pinpoint/trunk/pom.xml Tue Aug 28 21:53:47 2007
@@ -35,10 +35,10 @@
<module>pinpoint-search</module>
<module>pinpoint-importer</module>
<module>pinpoint-core</module>
- <module>pinpoint-web</module>
<module>pinpoint-service</module>
<module>pinpoint-metric</module>
<module>pinpoint-loadgenerator</module>
+ <module>pinpoint-web</module>
</modules>
<build>
<plugins>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org