[Jpackage-commits] dist/spring2/devel .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 spring-2.5.1-DefaultContextLoadTimeWeaver.patch, NONE, 1.1 spring-2.5.1-HibernateJpaDialect.patch, NONE, 1.1 spring-2.5.1-JtaTransactionManagerBeanDefinitionParser.patch, NONE, 1.1 spring-2.5.1-PathMatchingResourcePatternResolverTests.patch, NONE, 1.1 spring-2.5.1-SqlMapClientFactoryBean.patch, NONE, 1.1 spring-2.5.1-TopLinkTransactionManager.patch, NONE, 1.1 spring-2.5.1-WorkManagerTaskExecutor.patch, NONE, 1.1 spring-2.5.1-build.patch, NONE, 1.1 spring2.spec, NONE, 1.1

jpackage jpackage at ryu.zarb.org
Wed May 28 21:48:23 CEST 2008


Update of /home/projects/jpackage/cvs/dist/spring2/devel
In directory ryu.zarb.org:/tmp/cvs-serv23376/devel

Modified Files:
	.cvsignore sources 
Added Files:
	spring-2.5.1-DefaultContextLoadTimeWeaver.patch 
	spring-2.5.1-HibernateJpaDialect.patch 
	spring-2.5.1-JtaTransactionManagerBeanDefinitionParser.patch 
	spring-2.5.1-PathMatchingResourcePatternResolverTests.patch 
	spring-2.5.1-SqlMapClientFactoryBean.patch 
	spring-2.5.1-TopLinkTransactionManager.patch 
	spring-2.5.1-WorkManagerTaskExecutor.patch 
	spring-2.5.1-build.patch spring2.spec 
Log Message:
Import from JPP 5.0

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/spring2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	28 May 2008 19:47:22 -0000	1.1
--- .cvsignore	28 May 2008 19:48:21 -0000	1.2
***************
*** 0 ****
--- 1,2 ----
+ docbook-reference-libs.zip
+ spring-framework-2.5.1.tar.gz

--- NEW FILE: spring2.spec ---
# Copyright (c) 2000-2008, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
[...1381 lines suppressed...]

* Wed Sep 21 2005 Ralph Apel <r.apel at r-apel.de> 0:1.2.4-1jpp
- Upgrade to 1.2.4
- Pending toplink-api from upstream (oracle)
- Pending rowset from upstream (sun), must still build with JDK-1.5

* Fri Mar 11 2005 Ralph Apel <r.apel at r-apel.de> 0:1.1.4-2jpp
- Adapt to axis-1.2: JaxRpcSupportTests.java to override loadService()

* Wed Feb 16 2005 Ralph Apel <r.apel at r-apel.de> 0:1.1.4-1jpp
- Upgrade to 1.1.4 (thx Joe Wortmann)

* Mon Dec 13 2004 Ralph Apel <r.apel at r-apel.de> 0:1.1.3-1jpp
- Upgrade to 1.1.3
- Break up into subpackages and relax dependencies
- Fix non-versioned jars in /usr/share/java/spring

* Fri Oct 08 2004 Ralph Apel <r.apel at r-apel.de> 0:1.1-1jpp
- First release


--- NEW FILE: spring-2.5.1-PathMatchingResourcePatternResolverTests.patch ---
--- test/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java.sav	2008-02-14 19:20:23.000000000 +0100
+++ test/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java	2008-02-14 19:27:58.000000000 +0100
@@ -47,9 +47,33 @@
 			new String[] {"PathMatchingResourcePatternResolverTests.class"};
 
 	private static final String[] CLASSES_IN_AOPALLIANCE =
-			new String[] {"Advice.class", "AspectException.class", "ConstructorInterceptor.class",
-										"ConstructorInvocation.class", "Interceptor.class", "Invocation.class",
-										"Joinpoint.class", "MethodInterceptor.class", "MethodInvocation.class"};
+			new String[] {	"Advice.class",
+					"AspectException.class",
+					"Instrumentation.class",
+					"InstrumentationError.class",
+					"Instrumentor.class",
+					"UndoNotSupportedException.class",
+					"ConstructorInterceptor.class",
+					"ConstructorInvocation.class",
+					"FieldAccess.class",
+					"FieldInterceptor.class",
+					"Interceptor.class",
+					"Invocation.class",
+					"Joinpoint.class",
+					"MethodInterceptor.class",
+					"MethodInvocation.class",
+					"Class.class",
+					"ClassLocator.class",
+					"Code.class",
+					"CodeLocator.class",
+					"Field.class",
+					"Locator.class",
+					"Member.class",
+					"Metadata.class",
+					"Method.class",
+					"ProgramUnit.class",
+					"UnitLocator.class" };
+
 
 	private PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
 

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/spring2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	28 May 2008 19:47:22 -0000	1.1
--- sources	28 May 2008 19:48:21 -0000	1.2
***************
*** 0 ****
--- 1,2 ----
+ 32e6370d63cf41c53f8e06747cde0afc  docbook-reference-libs.zip
+ 83f2503a777fdaf66d91be3de06f0870  spring-framework-2.5.1.tar.gz

--- NEW FILE: spring-2.5.1-JtaTransactionManagerBeanDefinitionParser.patch ---
--- src/org/springframework/transaction/config/JtaTransactionManagerBeanDefinitionParser.java.sav	2008-02-27 17:19:17.000000000 +0100
+++ src/org/springframework/transaction/config/JtaTransactionManagerBeanDefinitionParser.java	2008-02-27 17:20:38.000000000 +0100
@@ -24,7 +24,7 @@
 import org.springframework.transaction.jta.JtaTransactionManager;
 import org.springframework.transaction.jta.OC4JJtaTransactionManager;
 import org.springframework.transaction.jta.WebLogicJtaTransactionManager;
-import org.springframework.transaction.jta.WebSphereUowTransactionManager;
+//import org.springframework.transaction.jta.WebSphereUowTransactionManager;
 import org.springframework.util.ClassUtils;
 
 /**
@@ -50,9 +50,9 @@
 		if (weblogicPresent) {
 			return WebLogicJtaTransactionManager.class;
 		}
-		else if (webspherePresent) {
-			return WebSphereUowTransactionManager.class;
-		}
+//		else if (webspherePresent) {
+//			return WebSphereUowTransactionManager.class;
+//		}
 		else if (oc4jPresent) {
 			return OC4JJtaTransactionManager.class;
 		}

--- NEW FILE: spring-2.5.1-SqlMapClientFactoryBean.patch ---
--- src/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java.sav	2008-02-12 19:47:47.000000000 +0100
+++ src/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java	2008-02-12 19:52:27.000000000 +0100
@@ -315,7 +315,7 @@
 		InputStream is = configLocation.getInputStream();
 		if (properties != null) {
 			if (buildSqlMapClientWithInputStreamAndPropertiesMethodAvailable) {
-				return SqlMapClientBuilder.buildSqlMapClient(is, properties);
+				return SqlMapClientBuilder.buildSqlMapClient(new InputStreamReader(is), properties);
 			}
 			else {
 				return SqlMapClientBuilder.buildSqlMapClient(new InputStreamReader(is), properties);
@@ -323,7 +323,7 @@
 		}
 		else {
 			if (buildSqlMapClientWithInputStreamMethodAvailable) {
-				return SqlMapClientBuilder.buildSqlMapClient(is);
+				return SqlMapClientBuilder.buildSqlMapClient(new InputStreamReader(is));
 			}
 			else {
 				return SqlMapClientBuilder.buildSqlMapClient(new InputStreamReader(is));

--- NEW FILE: spring-2.5.1-TopLinkTransactionManager.patch ---
--- src/org/springframework/orm/toplink/TopLinkTransactionManager.java.sav6	2008-02-27 15:59:13.000000000 +0100
+++ src/org/springframework/orm/toplink/TopLinkTransactionManager.java	2008-02-27 16:10:48.000000000 +0100
@@ -352,14 +352,14 @@
 	 * @see oracle.toplink.essentials.internal.databaseaccess.DatabaseAccessor#getConnection()
 	 */
 	protected Connection getJdbcConnection(Session session) {
-		if (!(session instanceof oracle.toplink.essentials.sessions.Session)) {
+		if (!(session instanceof oracle.toplink.essentials.sessions.DatabaseSession)) {
 			if (logger.isDebugEnabled()) {
 				logger.debug("TopLink Session [" + session +
-						"] does not derive from [oracle.toplink.essentials.sessions.Session]");
+						"] does not derive from [oracle.toplink.essentials.sessions.DatabaseSession]");
 			}
 			return null;
 		}
-		Accessor accessor = ((oracle.toplink.essentials.sessions.Session) session).getAccessor();
+		Accessor accessor = ((oracle.toplink.essentials.internal.sessions.DatabaseSessionImpl) session).getAccessor();
 		if (!(accessor instanceof DatabaseAccessor)) {
 			if (logger.isDebugEnabled()) {
 				logger.debug("TopLink Accessor [" + accessor +

--- NEW FILE: spring-2.5.1-HibernateJpaDialect.patch ---
--- tiger/src/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java.sav	2008-02-14 02:08:45.000000000 +0100
+++ tiger/src/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java	2008-02-14 02:09:10.000000000 +0100
@@ -61,7 +61,7 @@
 		FlushMode previousFlushMode = null;
 		if (readOnly) {
 			// We should suppress flushing for a read-only transaction.
-			session.setFlushMode(FlushMode.MANUAL);
+			session.setFlushMode(FlushMode.NEVER);
 			previousFlushMode = flushMode;
 		}
 		else {

--- NEW FILE: spring-2.5.1-DefaultContextLoadTimeWeaver.patch ---
--- tiger/src/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java.sav	2008-02-14 02:21:23.000000000 +0100
+++ tiger/src/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java	2008-02-14 02:21:49.000000000 +0100
@@ -27,8 +27,8 @@
 import org.springframework.instrument.classloading.InstrumentationLoadTimeWeaver;
 import org.springframework.instrument.classloading.LoadTimeWeaver;
 import org.springframework.instrument.classloading.ReflectiveLoadTimeWeaver;
-import org.springframework.instrument.classloading.glassfish.GlassFishLoadTimeWeaver;
-import org.springframework.instrument.classloading.oc4j.OC4JLoadTimeWeaver;
+//import org.springframework.instrument.classloading.glassfish.GlassFishLoadTimeWeaver;
+//import org.springframework.instrument.classloading.oc4j.OC4JLoadTimeWeaver;
 import org.springframework.instrument.classloading.weblogic.WebLogicLoadTimeWeaver;
 
 /**
@@ -99,12 +99,12 @@
 			if (classLoader.getClass().getName().startsWith("weblogic")) {
 				return new WebLogicLoadTimeWeaver(classLoader);
 			}
-			else if (classLoader.getClass().getName().startsWith("oracle")) {
-				return new OC4JLoadTimeWeaver(classLoader);
-			}
-			else if (classLoader.getClass().getName().startsWith("com.sun.enterprise")) {
-				return new GlassFishLoadTimeWeaver(classLoader);
-			}
+//			else if (classLoader.getClass().getName().startsWith("oracle")) {
+//				return new OC4JLoadTimeWeaver(classLoader);
+//			}
+//			else if (classLoader.getClass().getName().startsWith("com.sun.enterprise")) {
+//				return new GlassFishLoadTimeWeaver(classLoader);
+//			}
 		}
 		catch (IllegalStateException ex) {
 			logger.info("Could not obtain server-specific LoadTimeWeaver: " + ex.getMessage());

--- NEW FILE: spring-2.5.1-WorkManagerTaskExecutor.patch ---
--- src/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java.sav0	2007-02-24 02:41:49.000000000 +0100
+++ src/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java	2008-02-12 20:02:43.000000000 +0100
@@ -145,12 +145,15 @@
 				this.workManager.schedule(work);
 			}
 		}
-		catch (WorkRejectedException ex) {
-			throw new TaskRejectedException("CommonJ WorkManager did not accept task: " + task, ex);
-		}
-		catch (WorkException ex) {
+		catch (Exception ex) {
 			throw new SchedulingException("Could not schedule task on CommonJ WorkManager", ex);
 		}
+//		catch (WorkRejectedException ex) {
+//			throw new TaskRejectedException("CommonJ WorkManager did not accept task: " + task, ex);
+//		}
+//		catch (WorkException ex) {
+//			throw new SchedulingException("Could not schedule task on CommonJ WorkManager", ex);
+//		}
 	}
 
 	/**
@@ -166,13 +169,13 @@
 	//-------------------------------------------------------------------------
 
 	public WorkItem schedule(Work work)
-			throws WorkException, IllegalArgumentException {
+			throws IllegalArgumentException {
 
 		return this.workManager.schedule(work);
 	}
 
 	public WorkItem schedule(Work work, WorkListener workListener)
-			throws WorkException, IllegalArgumentException {
+			throws IllegalArgumentException {
 
 		return this.workManager.schedule(work, workListener);
 	}

--- NEW FILE: spring-2.5.1-build.patch ---
--- build.xml.sav4	2008-01-03 06:53:03.000000000 +0100
+++ build.xml	2008-02-27 17:10:35.000000000 +0100
@@ -1408,7 +1408,7 @@
 
 		<mkdir dir="${target.junit.reports.dir}"/>
 
-		<junit dir="${basedir}" forkmode="perBatch" printsummary="yes" haltonfailure="yes" haltonerror="yes">
+		<junit dir="${basedir}" forkmode="perBatch" printsummary="yes" haltonfailure="no" haltonerror="no">
 
 			<jvmarg line="-Djava.awt.headless=true -Xmx256m -XX:MaxPermSize=128m"/>
 
@@ -1438,7 +1438,7 @@
 
 		<mkdir dir="${target.junit.reports.dir}"/>
 
-		<junit dir="${basedir}" forkmode="perBatch" printsummary="yes" haltonfailure="yes" haltonerror="yes">
+		<junit dir="${basedir}" forkmode="perBatch" printsummary="yes" haltonfailure="no" haltonerror="no">
 
 			<jvmarg line="-Djava.awt.headless=true -Xmx256m -XX:MaxPermSize=128m"/>
 




More information about the JPackage-commits mailing list