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/30 06:56:15 UTC
svn commit: r571038 - in /labs/pinpoint/trunk: ./ pinpoint-cli/
pinpoint-core/ pinpoint-core/src/main/java/org/apache/logging/pinpoint/
pinpoint-importer/ pinpoint-metric/ pinpoint-search/ pinpoint-service/
pinpoint-web/ pinpoint-web/src/main/webapp/WE...
Author: psmith
Date: Wed Aug 29 21:56:13 2007
New Revision: 571038
URL: http://svn.apache.org/viewvc?rev=571038&view=rev
Log:
Finally worked out how to fix up this projcet inside Eclipse properly. It turns out
that the Maven Eclipse plugin is drawing the log4j 1.2.12 from the Springframework
and keeping it in the dependency tree even though Pinpoint requires 1.2.15.
This was working fine in the command-line, but not in Eclipse, so force exclude the log4j
dependency from Spring.
Still need to have duplicate properties in the sub-module poms to have property'd version
numbers of dependencies inside Eclipse (another problem the plugin doesn't like).
Fixed bug that was treating files inside the pinpoint home area as contexts when they shouldn't.
(honestly the Commons IO FileFilter stuff is a bit weird IMHO).
Web module now uses Spring Form controllers and nicely binds values. This is my first experimentation
with Spring MVC. Powerful stuff that.
Modified:
labs/pinpoint/trunk/.classpath
labs/pinpoint/trunk/TODO.txt
labs/pinpoint/trunk/pinpoint-cli/pom.xml
labs/pinpoint/trunk/pinpoint-core/pom.xml
labs/pinpoint/trunk/pinpoint-core/src/main/java/org/apache/logging/pinpoint/PinpointContext.java
labs/pinpoint/trunk/pinpoint-core/src/main/java/org/apache/logging/pinpoint/PinpointHome.java
labs/pinpoint/trunk/pinpoint-importer/pom.xml
labs/pinpoint/trunk/pinpoint-metric/pom.xml
labs/pinpoint/trunk/pinpoint-search/pom.xml
labs/pinpoint/trunk/pinpoint-service/pom.xml
labs/pinpoint/trunk/pinpoint-web/pom.xml
labs/pinpoint/trunk/pinpoint-web/src/main/webapp/WEB-INF/dispatcher-servlet.xml
labs/pinpoint/trunk/pom.xml
Modified: labs/pinpoint/trunk/.classpath
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/.classpath?rev=571038&r1=571037&r2=571038&view=diff
==============================================================================
--- labs/pinpoint/trunk/.classpath (original)
+++ labs/pinpoint/trunk/.classpath Wed Aug 29 21:56:13 2007
@@ -18,11 +18,14 @@
<classpathentry kind="src" path="pinpoint-importer/src/test/java"/>
<classpathentry excluding="**" kind="src" output="pinpoint-importer/src/main/resources" path="pinpoint-importer/src/main/resources"/>
<classpathentry excluding="**" kind="src" output="pinpoint-importer/src/test/resources" path="pinpoint-importer/src/test/resources"/>
- <classpathentry kind="src" path="pinpoint-web/src/main/java"/>
- <classpathentry kind="src" path="pinpoint-web/src/test/java"/>
<classpathentry kind="src" path="pinpoint-service/src/main/java"/>
<classpathentry kind="src" path="pinpoint-service/src/test/java"/>
<classpathentry excluding="**" kind="src" output="pinpoint-service/src/main/resources" path="pinpoint-service/src/main/resources"/>
+ <classpathentry kind="src" path="pinpoint-loadgenerator/src/main/java"/>
+ <classpathentry kind="src" path="pinpoint-loadgenerator/src/test/java"/>
+ <classpathentry kind="src" path="pinpoint-web/src/main/java"/>
+ <classpathentry kind="src" path="pinpoint-web/src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="pinpoint-web/src/main/resources" path="pinpoint-web/src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
Modified: labs/pinpoint/trunk/TODO.txt
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/TODO.txt?rev=571038&r1=571037&r2=571038&view=diff
==============================================================================
--- labs/pinpoint/trunk/TODO.txt (original)
+++ labs/pinpoint/trunk/TODO.txt Wed Aug 29 21:56:13 2007
@@ -1,6 +1,9 @@
TODO
* All POM's currently have their own copy of the properties that indicate which verion of jars are used. This is because of the maven-eclipse plugin. However I have not tested whether the latest stable dev version of the plugin works better.
+
+* Spring dependency appears to bring in log4j 1.2.12 inside the Eclipse plugin, needs explicit exclusion, NEEDS DOCUMENTING.
+
* I18n
Modified: labs/pinpoint/trunk/pinpoint-cli/pom.xml
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-cli/pom.xml?rev=571038&r1=571037&r2=571038&view=diff
==============================================================================
--- labs/pinpoint/trunk/pinpoint-cli/pom.xml (original)
+++ labs/pinpoint/trunk/pinpoint-cli/pom.xml Wed Aug 29 21:56:13 2007
@@ -30,13 +30,14 @@
<!-- unfortunately this is a duplicate of the parent pom.xml
the maven eclipse plugin doesn't appear to handle this properly
-->
- <properties>
- <lucene.version>2.2.0</lucene.version>
- <log4j.version>1.2.15-SNAPSHOT</log4j.version>
- <log4j.companion.version>1.0-SNAPSHOT</log4j.companion.version>
- <commonscli.version>1.0</commonscli.version>
- <jline.version>0.9.91</jline.version>
- </properties>
+ <properties>
+ <lucene.version>2.2.0</lucene.version>
+ <log4j.version>1.2.15</log4j.version>
+ <log4j.companion.version>1.0-SNAPSHOT</log4j.companion.version>
+ <commonscli.version>1.1</commonscli.version>
+ <jline.version>0.9.91</jline.version>
+ </properties>
+
<build>
<plugins>
<plugin>
Modified: labs/pinpoint/trunk/pinpoint-core/pom.xml
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-core/pom.xml?rev=571038&r1=571037&r2=571038&view=diff
==============================================================================
--- labs/pinpoint/trunk/pinpoint-core/pom.xml (original)
+++ labs/pinpoint/trunk/pinpoint-core/pom.xml Wed Aug 29 21:56:13 2007
@@ -10,6 +10,13 @@
<artifactId>pinpoint-core</artifactId>
<name>Pinpoint Core</name>
<version>1.0-SNAPSHOT</version>
+ <properties>
+ <lucene.version>2.2.0</lucene.version>
+ <log4j.version>1.2.15</log4j.version>
+ <log4j.companion.version>1.0-SNAPSHOT</log4j.companion.version>
+ <commonscli.version>1.1</commonscli.version>
+ <jline.version>0.9.91</jline.version>
+ </properties>
<dependencies>
<dependency>
<groupId>log4j</groupId>
@@ -81,14 +88,13 @@
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<version>2.0.5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
- <properties>
- <commonscli.version>1.0</commonscli.version>
- <jline.version>0.9.91</jline.version>
- <log4j.version>1.2.15-SNAPSHOT</log4j.version>
- <log4j.companion.version>1.0-SNAPSHOT</log4j.companion.version>
- <lucene.version>2.2.0</lucene.version>
- </properties>
</project>
Modified: labs/pinpoint/trunk/pinpoint-core/src/main/java/org/apache/logging/pinpoint/PinpointContext.java
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-core/src/main/java/org/apache/logging/pinpoint/PinpointContext.java?rev=571038&r1=571037&r2=571038&view=diff
==============================================================================
--- labs/pinpoint/trunk/pinpoint-core/src/main/java/org/apache/logging/pinpoint/PinpointContext.java (original)
+++ labs/pinpoint/trunk/pinpoint-core/src/main/java/org/apache/logging/pinpoint/PinpointContext.java Wed Aug 29 21:56:13 2007
@@ -1,26 +1,20 @@
/**
- 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.
-
-**/
+ * 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 org.apache.logging.pinpoint;
import java.io.File;
import java.io.IOException;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.log4j.Logger;
import org.apache.logging.pinpoint.utils.PinpointUtils;
@@ -53,7 +47,7 @@
+ contextRoot.getAbsolutePath());
}
}
-
+
if (!serializationFile.exists()) {
try {
LOG.info("Creating empty serialization file: "
@@ -112,6 +106,12 @@
}
initialize();
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this).append("contextRoot", getContextRoot().getAbsolutePath())
+ .toString();
}
}
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=571038&r1=571037&r2=571038&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 Wed Aug 29 21:56:13 2007
@@ -11,12 +11,10 @@
package org.apache.logging.pinpoint;
import java.io.File;
+import java.io.FileFilter;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.filefilter.FileFilterUtils;
import org.apache.commons.lang.SystemUtils;
import org.apache.log4j.Logger;
import org.apache.logging.pinpoint.utils.PinpointUtils;
@@ -26,7 +24,8 @@
@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;
@@ -36,17 +35,18 @@
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() + "'");
}
}
}
@@ -60,11 +60,40 @@
}
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());
- for (File file : listFiles) {
+ // IOFileFilter directoryFilter = FileFilterUtils.andFileFilter(
+ // FileFilterUtils.prefixFileFilter("ctx."), FileFilterUtils
+ // .directoryFileFilter());
+ //
+ // /*
+ // * This removes any thing marked as hidden
+ // */
+ // directoryFilter = FileFilterUtils.andFileFilter(directoryFilter,
+ // new IOFileFilter() {
+ //
+ // public boolean accept(File file) {
+ // return !file.isHidden();
+ // }
+ //
+ // public boolean accept(File dir, String name) {
+ // return accept(new File(dir, name));
+ // }
+ // });
+ // Collection<File> listFiles = FileUtils.listFiles(pinpointHome,
+ // FileFilterUtils.falseFileFilter(), directoryFilter);
+ // List<PinpointContext> ctxs = new ArrayList<PinpointContext>(listFiles
+ // .size());
+
+ File[] ctxDirNames = this.pinpointHome.listFiles(new FileFilter() {
+
+ public boolean accept(File pathname) {
+ return pathname.isDirectory() &&
+ pathname.getName().startsWith("ctx.");
+ }
+ });
+
+ List<PinpointContext> ctxs = new ArrayList<PinpointContext>(
+ ctxDirNames.length);
+ for (File file : ctxDirNames) {
ctxs.add(PinpointContext.create(this, file.getName()));
}
return ctxs;
Modified: labs/pinpoint/trunk/pinpoint-importer/pom.xml
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-importer/pom.xml?rev=571038&r1=571037&r2=571038&view=diff
==============================================================================
--- labs/pinpoint/trunk/pinpoint-importer/pom.xml (original)
+++ labs/pinpoint/trunk/pinpoint-importer/pom.xml Wed Aug 29 21:56:13 2007
@@ -30,13 +30,15 @@
<!-- unfortunately this is a duplicate of the parent pom.xml
the maven eclipse plugin doesn't appear to handle this properly
-->
- <properties>
- <lucene.version>2.2.0</lucene.version>
- <log4j.version>1.2.15-SNAPSHOT</log4j.version>
- <log4j.receivers.version>1.1-SNAPSHOT</log4j.receivers.version>
- <commonscli.version>1.0</commonscli.version>
- <jline.version>0.9.91</jline.version>
- </properties>
+ <properties>
+ <lucene.version>2.2.0</lucene.version>
+ <log4j.version>1.2.15</log4j.version>
+ <log4j.receivers.version>1.1-SNAPSHOT</log4j.receivers.version>
+ <log4j.companion.version>1.0-SNAPSHOT</log4j.companion.version>
+ <commonscli.version>1.1</commonscli.version>
+ <jline.version>0.9.91</jline.version>
+ </properties>
+
<build>
<plugins>
<plugin>
Modified: labs/pinpoint/trunk/pinpoint-metric/pom.xml
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-metric/pom.xml?rev=571038&r1=571037&r2=571038&view=diff
==============================================================================
--- labs/pinpoint/trunk/pinpoint-metric/pom.xml (original)
+++ labs/pinpoint/trunk/pinpoint-metric/pom.xml Wed Aug 29 21:56:13 2007
@@ -11,7 +11,13 @@
<name>Pinpoint Metric</name>
<description>Provides performance metric infrastructure for observing metric data over time</description>
<version>1.0-SNAPSHOT</version>
- <url>http://maven.apache.org</url>
+ <properties>
+ <lucene.version>2.2.0</lucene.version>
+ <log4j.version>1.2.15</log4j.version>
+ <log4j.companion.version>1.0-SNAPSHOT</log4j.companion.version>
+ <commonscli.version>1.1</commonscli.version>
+ <jline.version>0.9.91</jline.version>
+ </properties>
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -28,6 +34,17 @@
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<version>2.0.5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Modified: labs/pinpoint/trunk/pinpoint-search/pom.xml
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-search/pom.xml?rev=571038&r1=571037&r2=571038&view=diff
==============================================================================
--- labs/pinpoint/trunk/pinpoint-search/pom.xml (original)
+++ labs/pinpoint/trunk/pinpoint-search/pom.xml Wed Aug 29 21:56:13 2007
@@ -10,6 +10,14 @@
<artifactId>pinpoint-search</artifactId>
<name>Pinpoint Search</name>
<version>1.0-SNAPSHOT</version>
+ <properties>
+ <lucene.version>2.2.0</lucene.version>
+ <log4j.version>1.2.15</log4j.version>
+ <log4j.companion.version>1.0-SNAPSHOT</log4j.companion.version>
+ <commonscli.version>1.1</commonscli.version>
+ <jline.version>0.9.91</jline.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>log4j</groupId>
@@ -43,12 +51,5 @@
<version>1.4</version>
</dependency>
</dependencies>
- <properties>
- <commonscli.version>1.0</commonscli.version>
- <jline.version>0.9.91</jline.version>
- <log4j.version>1.2.15-SNAPSHOT</log4j.version>
- <log4j.companion.version>1.0-SNAPSHOT</log4j.companion.version>
- <lucene.version>2.2.0</lucene.version>
- </properties>
</project>
Modified: labs/pinpoint/trunk/pinpoint-service/pom.xml
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-service/pom.xml?rev=571038&r1=571037&r2=571038&view=diff
==============================================================================
--- labs/pinpoint/trunk/pinpoint-service/pom.xml (original)
+++ labs/pinpoint/trunk/pinpoint-service/pom.xml Wed Aug 29 21:56:13 2007
@@ -10,6 +10,13 @@
<artifactId>pinpoint-service</artifactId>
<name>Pinpoint Service Layer</name>
<version>1.0-SNAPSHOT</version>
+ <properties>
+ <lucene.version>2.2.0</lucene.version>
+ <log4j.version>1.2.15</log4j.version>
+ <log4j.companion.version>1.0-SNAPSHOT</log4j.companion.version>
+ <commonscli.version>1.1</commonscli.version>
+ <jline.version>0.9.91</jline.version>
+ </properties>
<build>
<plugins>
<plugin>
@@ -95,6 +102,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<version>2.0.5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
@@ -143,12 +156,5 @@
<version>1.0.1</version>
</dependency>
</dependencies>
- <properties>
- <log4j.receivers.version>1.1-SNAPSHOT</log4j.receivers.version>
- <commonscli.version>1.0</commonscli.version>
- <jline.version>0.9.91</jline.version>
- <log4j.version>1.2.15-SNAPSHOT</log4j.version>
- <lucene.version>2.2.0</lucene.version>
- </properties>
</project>
Modified: labs/pinpoint/trunk/pinpoint-web/pom.xml
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pinpoint-web/pom.xml?rev=571038&r1=571037&r2=571038&view=diff
==============================================================================
--- labs/pinpoint/trunk/pinpoint-web/pom.xml (original)
+++ labs/pinpoint/trunk/pinpoint-web/pom.xml Wed Aug 29 21:56:13 2007
@@ -1,46 +1,57 @@
-<?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>
- <parent>
- <artifactId>pinpoint</artifactId>
- <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>
- <artifactId>junit</artifactId>
- <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>
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+ <parent>
+ <artifactId>pinpoint</artifactId>
+ <groupId>org.apache.logging</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <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>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ <version>2.0.5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </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>
+ <dependency>
+ <groupId>jetty</groupId>
+ <artifactId>org.mortbay.jetty</artifactId>
+ <version>5.1.G1</version>
+ </dependency>
+ </dependencies>
+</project>
Modified: 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=571038&r1=571037&r2=571038&view=diff
==============================================================================
--- labs/pinpoint/trunk/pinpoint-web/src/main/webapp/WEB-INF/dispatcher-servlet.xml (original)
+++ labs/pinpoint/trunk/pinpoint-web/src/main/webapp/WEB-INF/dispatcher-servlet.xml Wed Aug 29 21:56:13 2007
@@ -17,4 +17,22 @@
-->
<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 ">
+
+ <bean id="handlerMapping" class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping"/>
+
+ <bean name="/searchContext.form" class="org.apache.logging.PinpointSearchContextController">
+ <property name="formView" value="search"/>
+ <property name="successView" value="results"/>
+ <property name="commandName" value="searchModel"/>
+ <property name="commandClass" value="org.apache.logging.pinpoint.search.PinpointSearchModel"/>
+ <property name="pinpointHome" ref="pinpointHome" />
+ </bean>
+
+ <bean id="jspViewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+ <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>
+ <property name="prefix" value="/WEB-INF/jsp/"/>
+ <property name="suffix" value=".jsp"/>
+ </bean>
+
+
</beans>
Modified: labs/pinpoint/trunk/pom.xml
URL: http://svn.apache.org/viewvc/labs/pinpoint/trunk/pom.xml?rev=571038&r1=571037&r2=571038&view=diff
==============================================================================
--- labs/pinpoint/trunk/pom.xml (original)
+++ labs/pinpoint/trunk/pom.xml Wed Aug 29 21:56:13 2007
@@ -25,7 +25,8 @@
<packaging>pom</packaging>
<properties>
<lucene.version>2.2.0</lucene.version>
- <log4j.version>1.2.15-SNAPSHOT</log4j.version>
+ <log4j.version>1.2.15</log4j.version>
+ <log4j.receivers.version>1.1-SNAPSHOT</log4j.receivers.version>
<log4j.companion.version>1.0-SNAPSHOT</log4j.companion.version>
<commonscli.version>1.1</commonscli.version>
<jline.version>0.9.91</jline.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org