You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@excalibur.apache.org by cz...@apache.org on 2005/11/08 14:47:50 UTC
svn commit: r331821 - in /excalibur/trunk: components/sourceresolve/
components/sourceresolve/src/java/org/apache/excalibur/source/impl/
components/store/ components/xmlutil/
containerkit/instrument/api/src/java/org/apache/excalibur/instrument/
contain...
Author: cziegeler
Date: Tue Nov 8 05:47:32 2005
New Revision: 331821
URL: http://svn.apache.org/viewcvs?rev=331821&view=rev
Log:
Update poms and cleanup code
Modified:
excalibur/trunk/components/sourceresolve/pom.xml
excalibur/trunk/components/sourceresolve/src/java/org/apache/excalibur/source/impl/ResourceSource.java
excalibur/trunk/components/store/pom.xml
excalibur/trunk/components/xmlutil/pom.xml
excalibur/trunk/containerkit/instrument/api/src/java/org/apache/excalibur/instrument/NoopInstrumentManager.java
excalibur/trunk/containerkit/logger/project.xml
excalibur/trunk/containerkit/logkit/project.xml
excalibur/trunk/framework/api/src/java/org/apache/avalon/framework/configuration/Configuration.java
excalibur/trunk/framework/impl/pom.xml
excalibur/trunk/framework/impl/src/test/org/apache/avalon/framework/configuration/test/DefaultConfigurationBuilderTestCase.java
Modified: excalibur/trunk/components/sourceresolve/pom.xml
URL: http://svn.apache.org/viewcvs/excalibur/trunk/components/sourceresolve/pom.xml?rev=331821&r1=331820&r2=331821&view=diff
==============================================================================
--- excalibur/trunk/components/sourceresolve/pom.xml (original)
+++ excalibur/trunk/components/sourceresolve/pom.xml Tue Nov 8 05:47:32 2005
@@ -45,11 +45,13 @@
<groupId>commons-vfs</groupId>
<artifactId>commons-vfs</artifactId>
<version>20050307052300</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>2.0.2</version>
+ <scope>compile</scope>
</dependency>
<!-- Needed only if using pre-1.4 JDK
<dependency>
@@ -67,11 +69,13 @@
<groupId>excalibur-fortress</groupId>
<artifactId>excalibur-fortress-container-api</artifactId>
<version>1.2</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>excalibur-fortress</groupId>
<artifactId>excalibur-fortress-meta</artifactId>
<version>1.2</version>
+ <scope>compile</scope>
</dependency>
<!-- for metadata generation only
<dependency>
Modified: excalibur/trunk/components/sourceresolve/src/java/org/apache/excalibur/source/impl/ResourceSource.java
URL: http://svn.apache.org/viewcvs/excalibur/trunk/components/sourceresolve/src/java/org/apache/excalibur/source/impl/ResourceSource.java?rev=331821&r1=331820&r2=331821&view=diff
==============================================================================
--- excalibur/trunk/components/sourceresolve/src/java/org/apache/excalibur/source/impl/ResourceSource.java (original)
+++ excalibur/trunk/components/sourceresolve/src/java/org/apache/excalibur/source/impl/ResourceSource.java Tue Nov 8 05:47:32 2005
@@ -27,7 +27,6 @@
import org.apache.excalibur.source.SourceNotFoundException;
import org.apache.excalibur.source.SourceUtil;
import org.apache.excalibur.source.SourceValidity;
-import org.apache.excalibur.source.impl.validity.NOPValidity;
import org.apache.excalibur.source.impl.validity.TimeStampValidity;
/**
Modified: excalibur/trunk/components/store/pom.xml
URL: http://svn.apache.org/viewcvs/excalibur/trunk/components/store/pom.xml?rev=331821&r1=331820&r2=331821&view=diff
==============================================================================
--- excalibur/trunk/components/store/pom.xml (original)
+++ excalibur/trunk/components/store/pom.xml Tue Nov 8 05:47:32 2005
@@ -47,6 +47,7 @@
<groupId>jisp</groupId>
<artifactId>jisp</artifactId>
<version>2.5.1</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>concurrent</groupId>
@@ -57,17 +58,20 @@
<groupId>excalibur-fortress</groupId>
<artifactId>excalibur-fortress-container-api</artifactId>
<version>1.2</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>excalibur-fortress</groupId>
<artifactId>excalibur-fortress-meta</artifactId>
<version>1.2</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<!-- for metadata generation only -->
<groupId>qdox</groupId>
<artifactId>qdox</artifactId>
<version>1.5</version>
+ <scope>compile</scope>
</dependency>
</dependencies>
<build>
Modified: excalibur/trunk/components/xmlutil/pom.xml
URL: http://svn.apache.org/viewcvs/excalibur/trunk/components/xmlutil/pom.xml?rev=331821&r1=331820&r2=331821&view=diff
==============================================================================
--- excalibur/trunk/components/xmlutil/pom.xml (original)
+++ excalibur/trunk/components/xmlutil/pom.xml Tue Nov 8 05:47:32 2005
@@ -33,16 +33,19 @@
<artifactId>saxon</artifactId>
<groupId>saxon</groupId>
<version>6.5.3</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<artifactId>saxon7</artifactId>
<groupId>saxon</groupId>
<version>7.9.1</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>xml-resolver</groupId>
<artifactId>xml-resolver</artifactId>
<version>1.1</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
@@ -63,6 +66,7 @@
<groupId>avalon-logkit</groupId>
<artifactId>avalon-logkit</artifactId>
<version>2.1</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>excalibur-pool</groupId>
Modified: excalibur/trunk/containerkit/instrument/api/src/java/org/apache/excalibur/instrument/NoopInstrumentManager.java
URL: http://svn.apache.org/viewcvs/excalibur/trunk/containerkit/instrument/api/src/java/org/apache/excalibur/instrument/NoopInstrumentManager.java?rev=331821&r1=331820&r2=331821&view=diff
==============================================================================
--- excalibur/trunk/containerkit/instrument/api/src/java/org/apache/excalibur/instrument/NoopInstrumentManager.java (original)
+++ excalibur/trunk/containerkit/instrument/api/src/java/org/apache/excalibur/instrument/NoopInstrumentManager.java Tue Nov 8 05:47:32 2005
@@ -36,8 +36,6 @@
*
* @param instrumentable Instrumentable to register with the InstrumentManager.
* @param instrumentableName The name to use when registering the Instrumentable.
- *
- * @throws Exception If there were any problems registering the Instrumentable.
*/
public void registerInstrumentable( Instrumentable instrumentable, String instrumentableName )
{
Modified: excalibur/trunk/containerkit/logger/project.xml
URL: http://svn.apache.org/viewcvs/excalibur/trunk/containerkit/logger/project.xml?rev=331821&r1=331820&r2=331821&view=diff
==============================================================================
--- excalibur/trunk/containerkit/logger/project.xml (original)
+++ excalibur/trunk/containerkit/logger/project.xml Tue Nov 8 05:47:32 2005
@@ -57,7 +57,7 @@
<dependency>
<id>log4j</id>
- <version>1.2.11</version>
+ <version>1.2.12</version>
<properties>
<build>true</build>
</properties>
Modified: excalibur/trunk/containerkit/logkit/project.xml
URL: http://svn.apache.org/viewcvs/excalibur/trunk/containerkit/logkit/project.xml?rev=331821&r1=331820&r2=331821&view=diff
==============================================================================
--- excalibur/trunk/containerkit/logkit/project.xml (original)
+++ excalibur/trunk/containerkit/logkit/project.xml Tue Nov 8 05:47:32 2005
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
<id>log4j</id>
- <version>1.2.11</version>
+ <version>1.2.12</version>
</dependency>
<dependency>
<id>servletapi</id>
Modified: excalibur/trunk/framework/api/src/java/org/apache/avalon/framework/configuration/Configuration.java
URL: http://svn.apache.org/viewcvs/excalibur/trunk/framework/api/src/java/org/apache/avalon/framework/configuration/Configuration.java?rev=331821&r1=331820&r2=331821&view=diff
==============================================================================
--- excalibur/trunk/framework/api/src/java/org/apache/avalon/framework/configuration/Configuration.java (original)
+++ excalibur/trunk/framework/api/src/java/org/apache/avalon/framework/configuration/Configuration.java Tue Nov 8 05:47:32 2005
@@ -76,35 +76,35 @@
* <code>conf.{@link #getAttributeNames getAttributeNames}().length</code>
* </td><td>2</td><td>1</td></tr>
* <tr align="center"><td align="left">
- * <code>conf.{@link #getChildren getChildren}().length</code>
+ * <code>conf.{@link #getChildren() getChildren}().length</code>
* </td><td colspan="2">2</td></tr>
* <tr align="center"><td align="left">
- * <code>conf.{@link #getAttributeAsFloat getAttributeAsFloat}("version")</code>
+ * <code>conf.{@link #getAttributeAsFloat(String) getAttributeAsFloat}("version")</code>
* </td><td colspan="2">1.3</td></tr>
* <tr align="center"><td align="left">
- * <code>conf.{@link #getChild getChild}("widget").{@link #getAttribute getAttribute}("name")</code>
+ * <code>conf.{@link #getChild(String) getChild}("widget").{@link #getAttribute(String) getAttribute}("name")</code>
* </td><td colspan="2">fooWidget</td></tr>
* <tr align="center"><td align="left">
- * <code>conf.{@link #getChild getChild}("widget")
- * .{@link #getAttributeAsBoolean getAttributeAsBoolean}("threadsafe")</code></td><td colspan="2">
+ * <code>conf.{@link #getChild(String) getChild}("widget")
+ * .{@link #getAttributeAsBoolean(String) getAttributeAsBoolean}("threadsafe")</code></td><td colspan="2">
* <code>true</code></td></tr>
* <tr align="center"><td align="left">
- * <code>conf.{@link #getChild getChild}("widget").{@link #getLocation getLocation}()</code>
+ * <code>conf.{@link #getChild(String) getChild}("widget").{@link #getLocation getLocation}()</code>
* </td><td colspan="2">file:///home/jeff/tmp/java/avalon/src/java/new.xconf:4:60</td></tr>
* <tr align="center"><td align="left">
- * <code>conf.{@link #getChild getChild}("desc").{@link #getName getName}()</code>
+ * <code>conf.{@link #getChild(String) getChild}("desc").{@link #getName getName}()</code>
* </td><td>desc (see {@link #getChild(String)})</td><td>desc</td></tr>
* <tr align="center"><td align="left">
- * <code>conf.{@link #getChild getChild}("doc:desc").{@link #getName getName}()</code>
+ * <code>conf.{@link #getChild(String) getChild}("doc:desc").{@link #getName getName}()</code>
* </td><td>doc:desc</td><td>doc:desc (see {@link #getChild(String)})</td></tr>
* <tr align="center"><td align="left">
- * <code>conf.{@link #getChild getChild}("desc").{@link #getValue getValue}()</code>
+ * <code>conf.{@link #getChild(String) getChild}("desc").{@link #getValue() getValue}()</code>
* </td><td>{@link ConfigurationException}</td><td>This is a highly fictitious config file</td></tr>
* <tr align="center"><td align="left">
- * <code>conf.{@link #getChild getChild}("doc:desc").{@link #getValue getValue}()</code>
+ * <code>conf.{@link #getChild(String) getChild}("doc:desc").{@link #getValue() getValue}()</code>
* </td><td>This is a highly fictitious config file</td><td>{@link ConfigurationException}</td></tr>
* <tr align="center"><td align="left">
- * <code>conf.{@link #getChild getChild}("desc").{@link #getNamespace getNamespace}()</code>
+ * <code>conf.{@link #getChild(String) getChild}("desc").{@link #getNamespace getNamespace}()</code>
* </td><td> </td><td>http://myco.com/documentation"</td></tr>
* </table>
* </p>
@@ -116,7 +116,7 @@
* <h3>Miscellanea</h3>
* <p>
* Currently, the configuration tree can only be traversed one node at a time,
- * eg., through {@link #getChild getChild("foo")} or {@link #getChildren}. In
+ * eg., through {@link #getChild(String) getChild("foo")} or {@link #getChildren()}. In
* a future release, it may be possible to access child nodes with an XPath-like
* syntax.
* </p>
Modified: excalibur/trunk/framework/impl/pom.xml
URL: http://svn.apache.org/viewcvs/excalibur/trunk/framework/impl/pom.xml?rev=331821&r1=331820&r2=331821&view=diff
==============================================================================
--- excalibur/trunk/framework/impl/pom.xml (original)
+++ excalibur/trunk/framework/impl/pom.xml Tue Nov 8 05:47:32 2005
@@ -61,6 +61,7 @@
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
<version>1.0.4</version>
+ <scope>provided</scope>
</dependency>
<!--
Modified: excalibur/trunk/framework/impl/src/test/org/apache/avalon/framework/configuration/test/DefaultConfigurationBuilderTestCase.java
URL: http://svn.apache.org/viewcvs/excalibur/trunk/framework/impl/src/test/org/apache/avalon/framework/configuration/test/DefaultConfigurationBuilderTestCase.java?rev=331821&r1=331820&r2=331821&view=diff
==============================================================================
--- excalibur/trunk/framework/impl/src/test/org/apache/avalon/framework/configuration/test/DefaultConfigurationBuilderTestCase.java (original)
+++ excalibur/trunk/framework/impl/src/test/org/apache/avalon/framework/configuration/test/DefaultConfigurationBuilderTestCase.java Tue Nov 8 05:47:32 2005
@@ -458,8 +458,6 @@
{
DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder();
- MyEntityResolver customResolver = new MyEntityResolver();
-
builder.setEntityResolver( new MyEntityResolver() );
File basedir = getWorkDir();
File testFile = new File( basedir, TEST_PATH );
---------------------------------------------------------------------
To unsubscribe, e-mail: scm-unsubscribe@excalibur.apache.org
For additional commands, e-mail: scm-help@excalibur.apache.org