Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move bootstrap to launch/support

Browse Source
This commit is contained in:
dsyer
2008-03-01 14:40:46 +00:00
parent b47a6e6405
commit 886e8b4f75
19 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/CommandLineJobRunner.java → spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/CommandLineJobRunner.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.bootstrap;
package org.springframework.batch.execution.launch.support;
import java.util.Properties;

2
spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/DefaultJobParametersFactory.java → spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactory.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.bootstrap;
package org.springframework.batch.execution.launch.support;
import java.text.DateFormat;
import java.text.DecimalFormat;

2
spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/ExitCodeMapper.java → spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ExitCodeMapper.java
View File

@@ -1,4 +1,4 @@
package org.springframework.batch.execution.bootstrap;
package org.springframework.batch.execution.launch.support;
/**

2
spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/ExportedJobLauncher.java → spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ExportedJobLauncher.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.batch.execution.bootstrap;
package org.springframework.batch.execution.launch.support;
import java.util.Properties;

4
spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/JvmSystemExiter.java → spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/JvmSystemExiter.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.bootstrap;
package org.springframework.batch.execution.launch.support;
/**
* Implementation of the {@link SystemExiter} interface that calls the standards
@@ -31,7 +31,7 @@ public class JvmSystemExiter implements SystemExiter {
* Delegate call to System.exit() with the argument provided. Do not use
* this at home children!
*
* @see org.springframework.batch.execution.bootstrap.SystemExiter#exit(int)
* @see org.springframework.batch.execution.launch.support.SystemExiter#exit(int)
*/
public void exit(int status) {
System.exit(status);

2
spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/ScheduledJobParametersFactory.java → spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactory.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.bootstrap;
package org.springframework.batch.execution.launch.support;
import java.text.DateFormat;
import java.text.ParseException;

2
spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/SimpleExportedJobLauncher.java → spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncher.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.bootstrap;
package org.springframework.batch.execution.launch.support;
import java.util.HashMap;
import java.util.Iterator;

2
spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/SimpleJvmExitCodeMapper.java → spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/SimpleJvmExitCodeMapper.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.batch.execution.bootstrap;
package org.springframework.batch.execution.launch.support;
import java.util.HashMap;
import java.util.Map;

2
spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/SystemExiter.java → spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/SystemExiter.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.bootstrap;
package org.springframework.batch.execution.launch.support;
/**
* Interface for exiting the JVM. This abstraction is only

0
spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/package.html → spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/package.html
View File

2
spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/StepExecutionProxyResource.java
View File

@@ -30,7 +30,7 @@ import org.springframework.batch.core.domain.StepExecution;
import org.springframework.batch.core.domain.StepListener;
import org.springframework.batch.core.listener.StepListenerSupport;
import org.springframework.batch.core.runtime.JobParametersFactory;
import org.springframework.batch.execution.bootstrap.DefaultJobParametersFactory;
import org.springframework.batch.execution.launch.support.DefaultJobParametersFactory;
import org.springframework.context.ResourceLoaderAware;
import org.springframework.core.io.FileSystemResourceLoader;
import org.springframework.core.io.Resource;

6
spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/CommandLineJobRunnerTests.java → spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/CommandLineJobRunnerTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.bootstrap;
package org.springframework.batch.execution.launch.support;
import junit.framework.TestCase;
@@ -22,9 +22,9 @@ import org.springframework.batch.core.domain.JobExecution;
import org.springframework.batch.core.domain.JobParameters;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
import org.springframework.batch.core.runtime.ExitStatusExceptionClassifier;
import org.springframework.batch.execution.bootstrap.CommandLineJobRunner;
import org.springframework.batch.execution.bootstrap.SystemExiter;
import org.springframework.batch.execution.launch.JobLauncher;
import org.springframework.batch.execution.launch.support.CommandLineJobRunner;
import org.springframework.batch.execution.launch.support.SystemExiter;
import org.springframework.batch.repeat.ExitStatus;
/**

4
spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/DefaultJobParametersFactoryTests.java → spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactoryTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.bootstrap;
package org.springframework.batch.execution.launch.support;
import java.text.DateFormat;
import java.text.DecimalFormat;
@@ -25,7 +25,7 @@ import junit.framework.TestCase;
import org.springframework.batch.core.domain.JobParameters;
import org.springframework.batch.core.domain.JobParametersBuilder;
import org.springframework.batch.execution.bootstrap.DefaultJobParametersFactory;
import org.springframework.batch.execution.launch.support.DefaultJobParametersFactory;
import org.springframework.util.StringUtils;
/**

4
spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/ScheduledJobParametersFactoryTests.java → spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactoryTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.bootstrap;
package org.springframework.batch.execution.launch.support;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -24,7 +24,7 @@ import junit.framework.TestCase;
import org.springframework.batch.core.domain.JobParameters;
import org.springframework.batch.core.domain.JobParametersBuilder;
import org.springframework.batch.execution.bootstrap.ScheduledJobParametersFactory;
import org.springframework.batch.execution.launch.support.ScheduledJobParametersFactory;
import org.springframework.util.StringUtils;
/**

24
spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/SimpleExportedJobLauncherTests.java → spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncherTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.execution.bootstrap;
package org.springframework.batch.execution.launch.support;
import java.util.ArrayList;
import java.util.List;
@@ -28,11 +28,11 @@ import org.springframework.batch.core.domain.JobParametersBuilder;
import org.springframework.batch.core.domain.StepExecution;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
import org.springframework.batch.core.runtime.JobParametersFactory;
import org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher;
import org.springframework.batch.execution.configuration.MapJobRegistry;
import org.springframework.batch.execution.configuration.ReferenceJobFactory;
import org.springframework.batch.execution.job.JobSupport;
import org.springframework.batch.execution.launch.JobLauncher;
import org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher;
import org.springframework.batch.execution.step.StepSupport;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.batch.support.PropertiesConverter;
@@ -66,7 +66,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#afterPropertiesSet()}.
* {@link org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher#afterPropertiesSet()}.
* @throws Exception
*/
public void testAfterPropertiesSet() throws Exception {
@@ -83,7 +83,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#afterPropertiesSet()}.
* {@link org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher#afterPropertiesSet()}.
* @throws Exception
*/
public void testAfterPropertiesSetWithLauncher() throws Exception {
@@ -105,7 +105,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#getStatistics()}.
* {@link org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher#getStatistics()}.
*/
public void testGetStatistics() {
Properties props = launcher.getStatistics();
@@ -115,7 +115,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#getStatistics()}.
* {@link org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher#getStatistics()}.
* @throws Exception
*/
public void testGetStatisticsWithContent() throws Exception {
@@ -128,7 +128,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#isRunning()}.
* {@link org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher#isRunning()}.
* @throws Exception
*/
public void testIsRunning() throws Exception {
@@ -139,7 +139,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#isRunning()}.
* {@link org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher#isRunning()}.
* @throws Exception
*/
public void testAlreadyRunning() throws Exception {
@@ -155,7 +155,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#run(java.lang.String)}.
* {@link org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher#run(java.lang.String)}.
*/
public void testRunNonExistentJob() {
String value = launcher.run("foo");
@@ -164,7 +164,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#run(java.lang.String)}.
* {@link org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher#run(java.lang.String)}.
* @throws Exception
*/
public void testRunJobWithParameters() throws Exception {
@@ -176,7 +176,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#run(java.lang.String)}.
* {@link org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher#run(java.lang.String)}.
* @throws Exception
*/
public void testRunJobWithParametersAndFactory() throws Exception {
@@ -196,7 +196,7 @@ public class SimpleExportedJobLauncherTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#stop()}.
* {@link org.springframework.batch.execution.launch.support.SimpleExportedJobLauncher#stop()}.
* @throws Exception
*/
public void testStop() throws Exception {

6
spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/SimpleJvmExitCodeMapperTests.java → spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/SimpleJvmExitCodeMapperTests.java
View File

@@ -14,15 +14,15 @@
* limitations under the License.
*/
package org.springframework.batch.execution.bootstrap;
package org.springframework.batch.execution.launch.support;
import java.util.HashMap;
import java.util.Map;
import junit.framework.TestCase;
import org.springframework.batch.execution.bootstrap.ExitCodeMapper;
import org.springframework.batch.execution.bootstrap.SimpleJvmExitCodeMapper;
import org.springframework.batch.execution.launch.support.ExitCodeMapper;
import org.springframework.batch.execution.launch.support.SimpleJvmExitCodeMapper;
import org.springframework.batch.repeat.ExitStatus;
public class SimpleJvmExitCodeMapperTests extends TestCase {

2
spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/StubJobLauncher.java → spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/StubJobLauncher.java
View File

@@ -1,4 +1,4 @@
package org.springframework.batch.execution.bootstrap;
package org.springframework.batch.execution.launch.support;
import org.springframework.batch.core.domain.Job;
import org.springframework.batch.core.domain.JobExecution;

8
spring-batch-execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml
View File

@@ -7,14 +7,14 @@
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
<bean id="simpleContainerLauncher" class="org.springframework.batch.execution.bootstrap.CommandLineJobRunnerTests$StubJobLauncher" />
<bean id="simpleContainerLauncher" class="org.springframework.batch.execution.launch.support.CommandLineJobRunnerTests$StubJobLauncher" />
<bean class="org.springframework.batch.execution.bootstrap.SimpleJvmExitCodeMapper" />
<bean class="org.springframework.batch.execution.launch.support.SimpleJvmExitCodeMapper" />
<bean
class="org.springframework.batch.execution.bootstrap.CommandLineJobRunnerTests$StubSystemExiter" />
class="org.springframework.batch.execution.launch.support.CommandLineJobRunnerTests$StubSystemExiter" />
<bean
class="org.springframework.batch.execution.bootstrap.CommandLineJobRunnerTests$StubExceptionClassifier" />
class="org.springframework.batch.execution.launch.support.CommandLineJobRunnerTests$StubExceptionClassifier" />
</beans>

4
spring-batch-execution/src/test/resources/simple-container-definition.xml
View File

@@ -62,7 +62,7 @@
<!-- init-method="clear"/-->
<bean
class="org.springframework.batch.execution.bootstrap.SimpleJvmExitCodeMapper" />
class="org.springframework.batch.execution.launch.support.SimpleJvmExitCodeMapper" />
<bean
class="org.springframework.beans.factory.config.CustomEditorConfigurer">
@@ -93,6 +93,6 @@
</bean>
<bean
class="org.springframework.batch.execution.bootstrap.CommandLineJobRunnerTests$StubSystemExiter" />
class="org.springframework.batch.execution.launch.support.CommandLineJobRunnerTests$StubSystemExiter" />
</beans>