Author: tv
Date: Sun Nov 27 13:36:13 2016
New Revision: 1771590
URL: http://svn.apache.org/viewvc?rev=1771590&view=rev
Log:
Some cleanup before release
Modified:
turbine/fulcrum/trunk/factory/src/changes/changes.xml
turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/DefaultFactoryService.java
turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/FactoryException.java
turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/FactoryService.java
turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/utils/ObjectInputStreamForContext.java
Modified: turbine/fulcrum/trunk/factory/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/factory/src/changes/changes.xml?rev=1771590&r1=1771589&r2=1771590&view=diff
==============================================================================
--- turbine/fulcrum/trunk/factory/src/changes/changes.xml (original)
+++ turbine/fulcrum/trunk/factory/src/changes/changes.xml Sun Nov 27 13:36:13
2016
@@ -24,7 +24,9 @@
</properties>
<body>
- <release version="1.0.5" date="in SVN">
+ <release version="1.1.1" date="in SVN">
+ </release>
+ <release version="1.1.0" date="2016-11-27">
<action dev="tv" type="add">
Added generics
</action>
Modified:
turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/DefaultFactoryService.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/DefaultFactoryService.java?rev=1771590&r1=1771589&r2=1771590&view=diff
==============================================================================
---
turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/DefaultFactoryService.java
(original)
+++
turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/DefaultFactoryService.java
Sun Nov 27 13:36:13 2016
@@ -82,6 +82,7 @@ public class DefaultFactoryService
primitiveClasses.put(Float.TYPE.toString(), Float.TYPE);
primitiveClasses.put(Double.TYPE.toString(), Double.TYPE);
}
+
/**
* temporary storage of class names between configure and initialize
*/
Modified:
turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/FactoryException.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/FactoryException.java?rev=1771590&r1=1771589&r2=1771590&view=diff
==============================================================================
---
turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/FactoryException.java
(original)
+++
turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/FactoryException.java
Sun Nov 27 13:36:13 2016
@@ -32,12 +32,35 @@ public class FactoryException extends Ex
*/
private static final long serialVersionUID = 8954422192583295720L;
- public FactoryException(String msg)
+ /**
+ * Default constructor
+ */
+ public FactoryException()
{
- super(msg);
+ super();
}
- public FactoryException(String msg, Exception ex)
+
+ /**
+ * @see java.lang.Exception(String, Throwable)
+ */
+ public FactoryException(String message, Throwable e)
{
- super(msg, ex);
+ super(message, e);
+ }
+
+ /**
+ * @see java.lang.Exception(Throwable)
+ */
+ public FactoryException(Throwable e)
+ {
+ super(e);
+ }
+
+ /**
+ * @see java.lang.Exception(String)
+ */
+ public FactoryException(String msg)
+ {
+ super(msg);
}
}
Modified:
turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/FactoryService.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/FactoryService.java?rev=1771590&r1=1771589&r2=1771590&view=diff
==============================================================================
---
turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/FactoryService.java
(original)
+++
turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/FactoryService.java
Sun Nov 27 13:36:13 2016
@@ -1,8 +1,5 @@
package org.apache.fulcrum.factory;
-import org.apache.avalon.framework.service.ServiceException;
-
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -22,8 +19,6 @@ import org.apache.avalon.framework.servi
* under the License.
*/
-
-
/**
* The Factory Service instantiates objects using either default
* class loaders or a specified one. Whether specified class
@@ -47,7 +42,7 @@ public interface FactoryService
*
* @param clazz the name of the class.
* @return the instance.
- * @throws ServiceException if instantiation fails.
+ * @throws FactoryException if instantiation fails.
*/
<T> T getInstance(Class<T> clazz)
throws FactoryException;
@@ -57,7 +52,7 @@ public interface FactoryService
*
* @param className the name of the class.
* @return the instance.
- * @throws ServiceException if instantiation fails.
+ * @throws FactoryException if instantiation fails.
*/
<T> T getInstance(String className)
throws FactoryException;
@@ -71,7 +66,7 @@ public interface FactoryService
* @param className the name of the class.
* @param loader the class loader.
* @return the instance.
- * @throws ServiceException if instantiation fails.
+ * @throws FactoryException if instantiation fails.
*/
<T> T getInstance(String className,
ClassLoader loader)
@@ -86,7 +81,7 @@ public interface FactoryService
* @param params an array containing the parameters of the constructor.
* @param signature an array containing the signature of the constructor.
* @return the instance.
- * @throws ServiceException if instantiation fails.
+ * @throws FactoryException if instantiation fails.
*/
<T> T getInstance(String className,
Object[] params,
@@ -106,7 +101,7 @@ public interface FactoryService
* @param params an array containing the parameters of the constructor.
* @param signature an array containing the signature of the constructor.
* @return the instance.
- * @throws ServiceException if instantiation fails.
+ * @throws FactoryException if instantiation fails.
*/
<T> T getInstance(String className,
ClassLoader loader,
@@ -119,7 +114,7 @@ public interface FactoryService
*
* @param className the name of the class.
* @return true if class loaders are supported, false otherwise.
- * @throws ServiceException if test fails.
+ * @throws FactoryException if test fails.
*/
boolean isLoaderSupported(String className)
throws FactoryException;
Modified:
turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/utils/ObjectInputStreamForContext.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/utils/ObjectInputStreamForContext.java?rev=1771590&r1=1771589&r2=1771590&view=diff
==============================================================================
---
turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/utils/ObjectInputStreamForContext.java
(original)
+++
turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/utils/ObjectInputStreamForContext.java
Sun Nov 27 13:36:13 2016
@@ -60,7 +60,7 @@ public class ObjectInputStreamForContext
}
/**
- * @see java.io.ObjectInputStream#resolveClass()
+ * @see java.io.ObjectInputStream#resolveClass(ObjectStreamClass)
*/
@Override
protected Class<?> resolveClass(ObjectStreamClass v)
