Author: painter
Date: Tue Nov 6 14:51:27 2018
New Revision: 1845928
URL: http://svn.apache.org/viewvc?rev=1845928&view=rev
Log:
Upgrade to Maven 3.x and cleanup javadoc (move to attic?)
Added:
turbine/fulcrum/trunk/naming/pom.xml
Removed:
turbine/fulcrum/trunk/naming/project.properties
turbine/fulcrum/trunk/naming/project.xml
Modified:
turbine/fulcrum/trunk/naming/src/java/org/apache/fulcrum/naming/DefaultNamingService.java
turbine/fulcrum/trunk/naming/src/test/org/apache/fulcrum/naming/NamingServiceTest.java
turbine/fulcrum/trunk/naming/xdocs/changes.xml
Added: turbine/fulcrum/trunk/naming/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/naming/pom.xml?rev=1845928&view=auto
==============================================================================
--- turbine/fulcrum/trunk/naming/pom.xml (added)
+++ turbine/fulcrum/trunk/naming/pom.xml Tue Nov 6 14:51:27 2018
@@ -0,0 +1,117 @@
+<?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. -->
+<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>turbine-parent</artifactId>
+ <groupId>org.apache.turbine</groupId>
+ <version>5</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>fulcrum-naming</artifactId>
+ <groupId>org.apache.fulcrum</groupId>
+ <version>1.0.3-SNAPSHOT</version>
+ <name>Fulcrum Naming</name>
+ <inceptionYear>2005</inceptionYear>
+ <description>Fulcrum Naming Service</description>
+ <url>http://turbine.apache.org/fulcrum/fulcrum-naming</url>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/naming/</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/naming/</developerConnection>
+
<url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/naming/</url>
+ </scm>
+
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <name>Fulcrum Website</name>
+
<url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/fulcrum/fulcrum-naming/</url>
+ </site>
+ </distributionManagement>
+
+ <developers>
+ <developer>
+ <name>Thomas Vandahl</name>
+ <id>tv</id>
+ <email>[email protected]</email>
+ <organization />
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ </developers>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>4.3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.fulcrum</groupId>
+ <artifactId>fulcrum-testcontainer</artifactId>
+ <version>1.0.8-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.fulcrum</groupId>
+ <artifactId>fulcrum-yaafi</artifactId>
+ <version>1.0.8-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <sourceDirectory>${basedir}/src/java</sourceDirectory>
+ <testSourceDirectory>${basedir}/src/test</testSourceDirectory>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+
<source>${maven.compiler.source}</source>
+
<target>${maven.compiler.target}</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>rc</id>
+ <distributionManagement>
+ <!-- Cannot define in parent ATM, see
COMMONSSITE-26 -->
+ <site>
+ <id>apache.website</id>
+ <name>Apache Fulcrum Release Candidate
Staging Site</name>
+
<url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/builds/fulcrum/${fulcrum.componentid}/${fulcrum.release.version}/${fulcrum.rc.version}/site</url>
+ </site>
+ </distributionManagement>
+ </profile>
+ </profiles>
+
+
+ <properties>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+
+ <!-- This bits are used for the staging directory -->
+
<fulcrum.release.version>1.0.3-SNAPSHOT</fulcrum.release.version>
+ <fulcrum.rc.version>RC1</fulcrum.rc.version>
+
<fulcrum.deployment.protocol>scpexe</fulcrum.deployment.protocol>
+ </properties>
+
+</project>
Modified:
turbine/fulcrum/trunk/naming/src/java/org/apache/fulcrum/naming/DefaultNamingService.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/naming/src/java/org/apache/fulcrum/naming/DefaultNamingService.java?rev=1845928&r1=1845927&r2=1845928&view=diff
==============================================================================
---
turbine/fulcrum/trunk/naming/src/java/org/apache/fulcrum/naming/DefaultNamingService.java
(original)
+++
turbine/fulcrum/trunk/naming/src/java/org/apache/fulcrum/naming/DefaultNamingService.java
Tue Nov 6 14:51:27 2018
@@ -51,14 +51,14 @@ public class DefaultNamingService
* A global HashTable of Property objects which are initialised using
* parameters from the ResourcesFile
*/
- private static Hashtable contextPropsList = null;
+ private static Hashtable<String, Properties> contextPropsList = null;
- private Hashtable initialContexts = new Hashtable();
+ private Hashtable<String, InitialContext> initialContexts = new
Hashtable<String, InitialContext>();
/**
* Return the Context with the specified name.
*
- * @param name The name of the context.
+ * @param contextName The name of the context.
* @return The context with the specified name, or null if no
* context exists with that name.
*/
@@ -90,13 +90,13 @@ public class DefaultNamingService
// ---------------- Avalon Lifecycle Methods ---------------------
- /**
- * Avalon component lifecycle method
+ /* (non-Javadoc)
+ * @see
org.apache.avalon.framework.configuration.Configurable#configure(org.apache.avalon.framework.configuration.Configuration)
*/
public void configure(Configuration conf) throws ConfigurationException
{
- contextPropsList = new Hashtable();
+ contextPropsList = new Hashtable<String, Properties>();
Configuration[] keys = conf.getChildren();
if (keys != null)
{
@@ -135,14 +135,14 @@ public class DefaultNamingService
return properties;
}
- /**
- * Avalon component lifecycle method
+ /* (non-Javadoc)
+ * @see org.apache.avalon.framework.activity.Initializable#initialize()
*/
public void initialize() throws Exception
{
try
{
- Enumeration contextPropsKeys = contextPropsList.keys();
+ Enumeration<String> contextPropsKeys = contextPropsList.keys();
while (contextPropsKeys.hasMoreElements())
{
String key = (String) contextPropsKeys.nextElement();
Modified:
turbine/fulcrum/trunk/naming/src/test/org/apache/fulcrum/naming/NamingServiceTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/naming/src/test/org/apache/fulcrum/naming/NamingServiceTest.java?rev=1845928&r1=1845927&r2=1845928&view=diff
==============================================================================
---
turbine/fulcrum/trunk/naming/src/test/org/apache/fulcrum/naming/NamingServiceTest.java
(original)
+++
turbine/fulcrum/trunk/naming/src/test/org/apache/fulcrum/naming/NamingServiceTest.java
Tue Nov 6 14:51:27 2018
@@ -47,7 +47,7 @@ public class NamingServiceTest extends B
/**
* Simple test that adds, retrieves, and deletes 2 object.
*
- * @throws Exception
+ * @throws Exception generic exception
*/
public void testGettingNamingService() throws Exception
{
Modified: turbine/fulcrum/trunk/naming/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/naming/xdocs/changes.xml?rev=1845928&r1=1845927&r2=1845928&view=diff
==============================================================================
--- turbine/fulcrum/trunk/naming/xdocs/changes.xml (original)
+++ turbine/fulcrum/trunk/naming/xdocs/changes.xml Tue Nov 6 14:51:27 2018
@@ -24,6 +24,12 @@
</properties>
<body>
+ <release version="1.0.3" date="in SVN">
+ <action dev="painter" type="update">
+ Upgrade to Maven 3.x and cleanup javadoc
+ Should probably move to the attic
+ </action>
+ </release>
<release version="1.0.2" date="2004-11-24">
<action dev="epugh" type="add">
Initial conversion to Avalon component.
