Author: olamy
Date: Tue Dec 4 17:37:49 2012
New Revision: 1417055
URL: http://svn.apache.org/viewvc?rev=1417055&view=rev
Log:
more renamed Plexus to Redback
Added:
archiva/redback/redback-components/trunk/spring-jdo2/src/main/java/org/apache/archiva/redback/components/jdo/RedbackObjectNotFoundException.java
(contents, props changed)
- copied, changed from r1417038,
archiva/redback/redback-components/trunk/spring-jdo2/src/main/java/org/apache/archiva/redback/components/jdo/PlexusObjectNotFoundException.java
archiva/redback/redback-components/trunk/spring-jdo2/src/main/java/org/apache/archiva/redback/components/jdo/RedbackStoreException.java
(contents, props changed)
- copied, changed from r1417038,
archiva/redback/redback-components/trunk/spring-jdo2/src/main/java/org/apache/archiva/redback/components/jdo/PlexusStoreException.java
Removed:
archiva/redback/redback-components/trunk/spring-jdo2/src/main/java/org/apache/archiva/redback/components/jdo/PlexusObjectNotFoundException.java
archiva/redback/redback-components/trunk/spring-jdo2/src/main/java/org/apache/archiva/redback/components/jdo/PlexusStoreException.java
Modified:
archiva/redback/redback-components/trunk/spring-jdo2/src/main/java/org/apache/archiva/redback/components/jdo/RedbackJdoUtils.java
Modified:
archiva/redback/redback-components/trunk/spring-jdo2/src/main/java/org/apache/archiva/redback/components/jdo/RedbackJdoUtils.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-jdo2/src/main/java/org/apache/archiva/redback/components/jdo/RedbackJdoUtils.java?rev=1417055&r1=1417054&r2=1417055&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-jdo2/src/main/java/org/apache/archiva/redback/components/jdo/RedbackJdoUtils.java
(original)
+++
archiva/redback/redback-components/trunk/spring-jdo2/src/main/java/org/apache/archiva/redback/components/jdo/RedbackJdoUtils.java
Tue Dec 4 17:37:49 2012
@@ -52,11 +52,11 @@ public class RedbackJdoUtils
* @param object
* @param fetchGroups
* @return
- * @throws PlexusStoreException
+ * @throws RedbackStoreException
* @see {@link #updateObject(PersistenceManager, Object)} for old
technique.
*/
public static Object saveObject( PersistenceManager pm, Object object,
String fetchGroups[] )
- throws PlexusStoreException
+ throws RedbackStoreException
{
Transaction tx = pm.currentTransaction();
@@ -66,7 +66,7 @@ public class RedbackJdoUtils
if ( ( JDOHelper.getObjectId( object ) != null ) &&
!JDOHelper.isDetached( object ) )
{
- throw new PlexusStoreException( "Existing object is not
detached: " + object );
+ throw new RedbackStoreException( "Existing object is not
detached: " + object );
}
if ( fetchGroups != null )
@@ -155,11 +155,11 @@ public class RedbackJdoUtils
* @param pm
* @param object
* @return
- * @throws PlexusStoreException
+ * @throws RedbackStoreException
* @see {@link #saveObject(PersistenceManager, Object, String[])}
*/
public static Object updateObject( PersistenceManager pm, Object object )
- throws PlexusStoreException
+ throws RedbackStoreException
{
Object ret = object;
Transaction tx = pm.currentTransaction();
@@ -170,7 +170,7 @@ public class RedbackJdoUtils
if ( !JDOHelper.isDetached( object ) )
{
- throw new PlexusStoreException( "Not detached: " + object );
+ throw new RedbackStoreException( "Not detached: " + object );
}
try
@@ -182,7 +182,7 @@ public class RedbackJdoUtils
// Do not hide useful error messages.
// This exception can occur if you have an object with a List
// that isn't initialized yet.
- throw new PlexusStoreException( "Unable to update object due
to unexpected null value.", npe );
+ throw new RedbackStoreException( "Unable to update object due
to unexpected null value.", npe );
}
catch ( Exception e )
{
@@ -218,17 +218,17 @@ public class RedbackJdoUtils
}
public static Object getObjectById( PersistenceManager pm, Class clazz,
String id )
- throws PlexusObjectNotFoundException, PlexusStoreException
+ throws RedbackObjectNotFoundException, RedbackStoreException
{
return getObjectById( pm, clazz, id, null );
}
public static Object getObjectById( PersistenceManager pm, Class clazz,
String id, String fetchGroup )
- throws PlexusStoreException, PlexusObjectNotFoundException
+ throws RedbackStoreException, RedbackObjectNotFoundException
{
if ( StringUtils.isBlank( id ) )
{
- throw new PlexusStoreException( "Unable to get object '" +
clazz.getName() + "' from jdo using null id." );
+ throw new RedbackStoreException( "Unable to get object '" +
clazz.getName() + "' from jdo using null id." );
}
Transaction tx = pm.currentTransaction();
@@ -254,11 +254,11 @@ public class RedbackJdoUtils
}
catch ( JDOObjectNotFoundException e )
{
- throw new PlexusObjectNotFoundException( clazz.getName(), id );
+ throw new RedbackObjectNotFoundException( clazz.getName(), id );
}
catch ( JDOException e )
{
- throw new PlexusStoreException( "Error handling JDO", e );
+ throw new RedbackStoreException( "Error handling JDO", e );
}
finally
{
@@ -271,7 +271,7 @@ public class RedbackJdoUtils
* instead
*/
public static Object getObjectById( PersistenceManager pm, Class clazz,
int id )
- throws PlexusStoreException, PlexusObjectNotFoundException
+ throws RedbackStoreException, RedbackObjectNotFoundException
{
return getObjectById( pm, clazz, (long) id );
}
@@ -285,13 +285,13 @@ public class RedbackJdoUtils
* returned.
* @param id Object identifier to match in the database.
* @return Object instance that matches the passed in identifier.
- * @throws PlexusStoreException if there was an error querying
the database
+ * @throws RedbackStoreException if there was an error querying
the database
* for the object.
- * @throws PlexusObjectNotFoundException if a matching object could not be
+ * @throws RedbackObjectNotFoundException if a matching object could not be
* found.
*/
public static Object getObjectById( PersistenceManager pm, Class clazz,
long id )
- throws PlexusStoreException, PlexusObjectNotFoundException
+ throws RedbackStoreException, RedbackObjectNotFoundException
{
return getObjectById( pm, clazz, id, null );
}
@@ -302,7 +302,7 @@ public class RedbackJdoUtils
* instead
*/
public static Object getObjectById( PersistenceManager pm, Class clazz,
int id, String fetchGroup )
- throws PlexusStoreException, PlexusObjectNotFoundException
+ throws RedbackStoreException, RedbackObjectNotFoundException
{
return getObjectById( pm, clazz, (long) id, fetchGroup );
}
@@ -317,13 +317,13 @@ public class RedbackJdoUtils
* @param id Object identifier to match in the database.
* @param fetchGroup TODO: Document!
* @return Object instance that matches the passed in identifier.
- * @throws PlexusStoreException if there was an error querying
the database
+ * @throws RedbackStoreException if there was an error querying
the database
* for the object.
- * @throws PlexusObjectNotFoundException if a matching object could not be
+ * @throws RedbackObjectNotFoundException if a matching object could not be
* found.
*/
public static Object getObjectById( PersistenceManager pm, Class clazz,
long id, String fetchGroup )
- throws PlexusStoreException, PlexusObjectNotFoundException
+ throws RedbackStoreException, RedbackObjectNotFoundException
{
Transaction tx = pm.currentTransaction();
@@ -348,12 +348,12 @@ public class RedbackJdoUtils
}
catch ( JDOObjectNotFoundException e )
{
- throw new PlexusObjectNotFoundException( clazz.getName(),
Long.toString( id ) );
+ throw new RedbackObjectNotFoundException( clazz.getName(),
Long.toString( id ) );
}
catch ( JDOException e )
{
LoggerFactory.getLogger( RedbackJdoUtils.class ).error(
e.getMessage(), e );
- throw new PlexusStoreException( "Error handling JDO", e );
+ throw new RedbackStoreException( "Error handling JDO", e );
}
finally
{
@@ -363,7 +363,7 @@ public class RedbackJdoUtils
public static Object getObjectFromQuery( PersistenceManager pm, Class
clazz, String idField, String id,
String fetchGroup )
- throws PlexusStoreException, PlexusObjectNotFoundException
+ throws RedbackStoreException, RedbackObjectNotFoundException
{
Transaction tx = pm.currentTransaction();
@@ -385,12 +385,12 @@ public class RedbackJdoUtils
if ( result.size() == 0 )
{
- throw new PlexusObjectNotFoundException( clazz.getName(), id );
+ throw new RedbackObjectNotFoundException( clazz.getName(), id
);
}
if ( result.size() > 1 )
{
- throw new PlexusStoreException(
+ throw new RedbackStoreException(
"A query for object of " + "type " + clazz.getName() + "
on the " + "field '" + idField
+ "' returned more than one object." );
}
Copied:
archiva/redback/redback-components/trunk/spring-jdo2/src/main/java/org/apache/archiva/redback/components/jdo/RedbackObjectNotFoundException.java
(from r1417038,
archiva/redback/redback-components/trunk/spring-jdo2/src/main/java/org/apache/archiva/redback/components/jdo/PlexusObjectNotFoundException.java)
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-jdo2/src/main/java/org/apache/archiva/redback/components/jdo/RedbackObjectNotFoundException.java?p2=archiva/redback/redback-components/trunk/spring-jdo2/src/main/java/org/apache/archiva/redback/components/jdo/RedbackObjectNotFoundException.java&p1=archiva/redback/redback-components/trunk/spring-jdo2/src/main/java/org/apache/archiva/redback/components/jdo/PlexusObjectNotFoundException.java&r1=1417038&r2=1417055&rev=1417055&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-jdo2/src/main/java/org/apache/archiva/redback/components/jdo/PlexusObjectNotFoundException.java
(original)
+++
archiva/redback/redback-components/trunk/spring-jdo2/src/main/java/org/apache/archiva/redback/components/jdo/RedbackObjectNotFoundException.java
Tue Dec 4 17:37:49 2012
@@ -23,10 +23,10 @@ package org.apache.archiva.redback.compo
* @author <a href="mailto:[email protected]";>Emmanuel Venisse</a>
*
*/
-public class PlexusObjectNotFoundException
- extends PlexusStoreException
+public class RedbackObjectNotFoundException
+ extends RedbackStoreException
{
- public PlexusObjectNotFoundException( String type, String id )
+ public RedbackObjectNotFoundException( String type, String id )
{
super( "Could not find object. Type '" + type + "'. Id: '" + id + "'."
);
}
Propchange:
archiva/redback/redback-components/trunk/spring-jdo2/src/main/java/org/apache/archiva/redback/components/jdo/RedbackObjectNotFoundException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/redback/redback-components/trunk/spring-jdo2/src/main/java/org/apache/archiva/redback/components/jdo/RedbackObjectNotFoundException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
archiva/redback/redback-components/trunk/spring-jdo2/src/main/java/org/apache/archiva/redback/components/jdo/RedbackStoreException.java
(from r1417038,
archiva/redback/redback-components/trunk/spring-jdo2/src/main/java/org/apache/archiva/redback/components/jdo/PlexusStoreException.java)
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-jdo2/src/main/java/org/apache/archiva/redback/components/jdo/RedbackStoreException.java?p2=archiva/redback/redback-components/trunk/spring-jdo2/src/main/java/org/apache/archiva/redback/components/jdo/RedbackStoreException.java&p1=archiva/redback/redback-components/trunk/spring-jdo2/src/main/java/org/apache/archiva/redback/components/jdo/PlexusStoreException.java&r1=1417038&r2=1417055&rev=1417055&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-jdo2/src/main/java/org/apache/archiva/redback/components/jdo/PlexusStoreException.java
(original)
+++
archiva/redback/redback-components/trunk/spring-jdo2/src/main/java/org/apache/archiva/redback/components/jdo/RedbackStoreException.java
Tue Dec 4 17:37:49 2012
@@ -23,15 +23,15 @@ package org.apache.archiva.redback.compo
* @author <a href="mailto:[email protected]";>Emmanuel Venisse</a>
*
*/
-public class PlexusStoreException
+public class RedbackStoreException
extends Exception
{
- public PlexusStoreException( String msg )
+ public RedbackStoreException( String msg )
{
super( msg );
}
- public PlexusStoreException( String msg, Exception ex )
+ public RedbackStoreException( String msg, Exception ex )
{
super( msg, ex );
}
Propchange:
archiva/redback/redback-components/trunk/spring-jdo2/src/main/java/org/apache/archiva/redback/components/jdo/RedbackStoreException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/redback/redback-components/trunk/spring-jdo2/src/main/java/org/apache/archiva/redback/components/jdo/RedbackStoreException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
