Author: henning
Date: Mon Aug 29 10:42:06 2005
New Revision: 264175
URL: http://svn.apache.org/viewcvs?rev=264175&view=rev
Log:
Remove blanks
Modified:
jakarta/turbine/stratum/trunk/conf/turbine-checkstyle.xml
jakarta/turbine/stratum/trunk/project.properties
jakarta/turbine/stratum/trunk/project.xml
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/component/Component.java
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/component/ComponentLoader.java
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/lifecycle/Disposable.java
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/lifecycle/Startable.java
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/lifecycle/Suspendable.java
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/ojb/OJBComponent.java
jakarta/turbine/stratum/trunk/src/test-conf/OJBrepository.dtd
jakarta/turbine/stratum/trunk/src/test-conf/Scheduler.xml
jakarta/turbine/stratum/trunk/src/test-conf/Scheduler.xsd
jakarta/turbine/stratum/trunk/src/test-conf/TestComponentLoader.properties
jakarta/turbine/stratum/trunk/src/test/org/apache/stratum/component/TestComponentLoader.java
jakarta/turbine/stratum/trunk/src/test/org/apache/stratum/messenger/MessengerComponentTest.java
jakarta/turbine/stratum/trunk/src/test/org/apache/stratum/scheduler/TestScheduler.java
jakarta/turbine/stratum/trunk/src/test/org/apache/stratum/scheduler/examplejobs/JobOne.java
jakarta/turbine/stratum/trunk/src/test/org/apache/stratum/scheduler/examplejobs/JobTwo.java
Modified: jakarta/turbine/stratum/trunk/conf/turbine-checkstyle.xml
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/stratum/trunk/conf/turbine-checkstyle.xml?rev=264175&r1=264174&r2=264175&view=diff
==============================================================================
--- jakarta/turbine/stratum/trunk/conf/turbine-checkstyle.xml (original)
+++ jakarta/turbine/stratum/trunk/conf/turbine-checkstyle.xml Mon Aug 29
10:42:06 2005
@@ -166,7 +166,7 @@
<!-- See http://checkstyle.sf.net/config_blocks.html -->
<module name="AvoidNestedBlocks"/>
<module name="EmptyBlock"/>
-
+
<module name="NeedBraces"/>
Modified: jakarta/turbine/stratum/trunk/project.properties
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/stratum/trunk/project.properties?rev=264175&r1=264174&r2=264175&view=diff
==============================================================================
--- jakarta/turbine/stratum/trunk/project.properties (original)
+++ jakarta/turbine/stratum/trunk/project.properties Mon Aug 29 10:42:06 2005
@@ -23,10 +23,10 @@
# -------------------------------------------------------------------
#========================================================================
-#
+#
# Maven building and deploy. These settings are for deployment to
www.apache.org.
# If you are not an Turbine committer, you can safely ignore these. :-)
-#
+#
#========================================================================
maven.repo.remote=http://www.ibiblio.org/maven/,http://www.apache.org/dist/java-repository/
maven.remote.group=apcvs
Modified: jakarta/turbine/stratum/trunk/project.xml
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/stratum/trunk/project.xml?rev=264175&r1=264174&r2=264175&view=diff
==============================================================================
--- jakarta/turbine/stratum/trunk/project.xml (original)
+++ jakarta/turbine/stratum/trunk/project.xml Mon Aug 29 10:42:06 2005
@@ -99,7 +99,7 @@
<id>epugh</id>
<email>[EMAIL PROTECTED]</email>
<organization>OpenSource Connections</organization>
- </developer>
+ </developer>
<developer>
<name>Eric Dobbs</name>
<id>dobbs</id>
@@ -266,13 +266,13 @@
<type>plugin</type>
</dependency>
- <dependency>
- <groupId>maven-plugins</groupId>
- <artifactId>maven-findbugs-plugin</artifactId>
- <version>0.9.1</version>
- <url>http://maven-plugins.sourceforge.net/maven-findbugs-plugin/</url>
+ <dependency>
+ <groupId>maven-plugins</groupId>
+ <artifactId>maven-findbugs-plugin</artifactId>
+ <version>0.9.1</version>
+ <url>http://maven-plugins.sourceforge.net/maven-findbugs-plugin/</url>
<type>plugin</type>
- </dependency>
+ </dependency>
<dependency>
<groupId>maven</groupId>
@@ -332,7 +332,7 @@
<jars></jars>
</build>
- <reports>
+ <reports>
<report>maven-jdepend-plugin</report>
<report>maven-checkstyle-plugin</report>
<report>maven-changes-plugin</report>
@@ -347,6 +347,6 @@
<report>maven-pmd-plugin</report>
<report>maven-simian-plugin</report>
<report>maven-jcoverage-plugin</report>
- <report>maven-findbugs-plugin</report>
+ <report>maven-findbugs-plugin</report>
</reports>
</project>
Modified:
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/component/Component.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/component/Component.java?rev=264175&r1=264174&r2=264175&view=diff
==============================================================================
---
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/component/Component.java
(original)
+++
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/component/Component.java
Mon Aug 29 10:42:06 2005
@@ -24,4 +24,4 @@
boolean isConfigured();
void setConfiguration(Configuration configuration);
Configuration getConfiguration();
-}
+}
Modified:
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/component/ComponentLoader.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/component/ComponentLoader.java?rev=264175&r1=264174&r2=264175&view=diff
==============================================================================
---
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/component/ComponentLoader.java
(original)
+++
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/component/ComponentLoader.java
Mon Aug 29 10:42:06 2005
@@ -29,9 +29,9 @@
/**
* Loader for Components implementing the lifecyle Interfaces.
- *
+ *
* NOTE: This class is in its infancy and will more than likely change.
- *
+ *
* @author <a href="mailto:eric NOSPAM dobbse.net">Eric Dobbs </a>
* @author <a href="mailto:[EMAIL PROTECTED]">Martin Poeschl </a>
* @version $Id$
@@ -76,7 +76,7 @@
/**
* Constructor
- *
+ *
* @param configuration
*/
public ComponentLoader(Configuration configuration) {
@@ -85,7 +85,7 @@
/**
* Set the configuration for this ComponentLoader
- *
+ *
* @param configuration
* Configuration
*/
@@ -95,7 +95,7 @@
/**
* Support method for testing the constructor
- *
+ *
* @return the configuration
*/
public Configuration getConfiguration() {
@@ -107,14 +107,14 @@
* Load all the components listed in the ComponentLoader's configuration.
* Log any errors, but throw no exceptions if components cannot be loaded.
* </p>
- *
+ *
* Configuration notes: <br/>Components are identified in the properties
* file as follows: <br/><code>
* component.name=NAME
* component.NAME.classname = com.mycompany.components.SomeComponent
* component.NAME.config = path/to/SomeComponent.properties
* </code>
- *
+ *
* @return an array of loaded components
*/
public Object[] load() {
@@ -146,7 +146,7 @@
* initialize it. <br>
* The component must implement the <code>Initializable</code> and
<code>Configurable</code>
* interfaces.
- *
+ *
* @see Initializable
* @see Configurable
* @param className
@@ -195,12 +195,12 @@
* Get the component's classname as defined in the ComponentLoader
* configuration.
* </p>
- *
+ *
* <p>
* Example property: <br/>
* component.NAME.classname=com.mycompany.components.MyComponent
* </p>
- *
+ *
* @param name
* the String NAME of the component in the classfile
* @return the configured classname
@@ -215,11 +215,11 @@
* Get the component's config file as defined in the ComponentLoader
* configuration.
* </p>
- *
+ *
* <p>
* Example property: <br/>component.NAME.config=path/to/your/config
* </p>
- *
+ *
* @param name
* the String NAME of the component in the classfile
* @return the configured config file
@@ -233,13 +233,13 @@
* Get any additional configuration properties from the master
* configuration.
* </p>
- *
+ *
* <p>
* Example property: <br/>component.NAME.property.key1==value1 <br/>
* component.NAME.property.key2==value2 <br/>
* component.NAME.property.key3==value3 <br/>
* </p>
- *
+ *
* @param name
* the String NAME of the component in the classfile
* @return the extra properties as a Configuration object
Modified:
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/lifecycle/Disposable.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/lifecycle/Disposable.java?rev=264175&r1=264174&r2=264175&view=diff
==============================================================================
---
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/lifecycle/Disposable.java
(original)
+++
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/lifecycle/Disposable.java
Mon Aug 29 10:42:06 2005
@@ -18,7 +18,7 @@
*/
/**
- * The Disposable interface is used when components need to
+ * The Disposable interface is used when components need to
* deallocate and dispose resources prior to their destruction.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Federico Barbieri</a>
Modified:
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/lifecycle/Startable.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/lifecycle/Startable.java?rev=264175&r1=264174&r2=264175&view=diff
==============================================================================
---
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/lifecycle/Startable.java
(original)
+++
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/lifecycle/Startable.java
Mon Aug 29 10:42:06 2005
@@ -19,9 +19,9 @@
/**
* The Startable interface is used when components need to
- * be "running" to be active. It provides a method through
- * which components can be "started" and "stopped" without
- * requiring a thread.
+ * be "running" to be active. It provides a method through
+ * which components can be "started" and "stopped" without
+ * requiring a thread.
* Note that these methods should start the component but return
* imediately.
*
Modified:
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/lifecycle/Suspendable.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/lifecycle/Suspendable.java?rev=264175&r1=264174&r2=264175&view=diff
==============================================================================
---
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/lifecycle/Suspendable.java
(original)
+++
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/lifecycle/Suspendable.java
Mon Aug 29 10:42:06 2005
@@ -18,7 +18,7 @@
*/
/**
- * The Suspendable interface is used when a component
+ * The Suspendable interface is used when a component
* will need to temporarily halt execution of a component.
* The execution may be halted so that you can reconfigure/
* recompose/recontextualize component.
Modified:
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/ojb/OJBComponent.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/ojb/OJBComponent.java?rev=264175&r1=264174&r2=264175&view=diff
==============================================================================
---
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/ojb/OJBComponent.java
(original)
+++
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/ojb/OJBComponent.java
Mon Aug 29 10:42:06 2005
@@ -29,7 +29,7 @@
import ojb.broker.PersistenceBrokerFactory;
/**
- * This class is the Object Bridege component that
+ * This class is the Object Bridege component that
*
* @author <a href="mailto:[EMAIL PROTECTED]">John Thorhauer</a>
* @version $Id$
@@ -42,19 +42,19 @@
* Log4j category used for logging.
*/
private static Category log = Category.getInstance(OJBComponent.class);
-
+
private PersistenceBroker pBroker = null;
- /** The location of the OJB properties file */
+ /** The location of the OJB properties file */
private String propLocation;
- /** The location of the OJB repository file */
+ /** The location of the OJB repository file */
private String repositoryLocation;
/**
* Configure the Broker
*/
- public void configure(Configuration configuration)
+ public void configure(Configuration configuration)
throws NestableException
{
propLocation = configuration.getString("ojb.properties.location");
@@ -82,7 +82,7 @@
pBroker = PersistenceBrokerFactory.createPersistenceBroker(
repositoryLocation);
}
-
+
/**
* Retrieves the initialized persistence broker
*
Modified: jakarta/turbine/stratum/trunk/src/test-conf/OJBrepository.dtd
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/stratum/trunk/src/test-conf/OJBrepository.dtd?rev=264175&r1=264174&r2=264175&view=diff
==============================================================================
--- jakarta/turbine/stratum/trunk/src/test-conf/OJBrepository.dtd (original)
+++ jakarta/turbine/stratum/trunk/src/test-conf/OJBrepository.dtd Mon Aug 29
10:42:06 2005
@@ -52,7 +52,7 @@
<!ELEMENT rowReader (#PCDATA)>
<!ATTLIST JdbcConnectionDescriptor id CDATA #IMPLIED>
-<!ATTLIST ClassDescriptor
+<!ATTLIST ClassDescriptor
id CDATA #IMPLIED
isolation CDATA #IMPLIED
>
Modified: jakarta/turbine/stratum/trunk/src/test-conf/Scheduler.xml
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/stratum/trunk/src/test-conf/Scheduler.xml?rev=264175&r1=264174&r2=264175&view=diff
==============================================================================
--- jakarta/turbine/stratum/trunk/src/test-conf/Scheduler.xml (original)
+++ jakarta/turbine/stratum/trunk/src/test-conf/Scheduler.xml Mon Aug 29
10:42:06 2005
@@ -47,7 +47,7 @@
<!--category>testCat</category-->
</loggerConfig>
</loggerConfigs>
-
+
<jobConfigs>
<jobConfig>
<name>job1</name>
@@ -60,13 +60,13 @@
<className>org.apache.stratum.scheduler.examplejobs.JobTwo</className>
</jobConfig>
</jobConfigs>
-
+
<triggerConfigs>
<!--
This trigger is a Quartz trigger that uses a "Cron-Expression" which
- is a string comprised of 6 fields separated by white space. The 6
+ is a string comprised of 6 fields separated by white space. The 6
fields are as follows:
-
+
Field Name Allowed Values Allowed Special Characters
seconds 0-59 , - * /
minutes 0-59 , - * /
Modified: jakarta/turbine/stratum/trunk/src/test-conf/Scheduler.xsd
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/stratum/trunk/src/test-conf/Scheduler.xsd?rev=264175&r1=264174&r2=264175&view=diff
==============================================================================
--- jakarta/turbine/stratum/trunk/src/test-conf/Scheduler.xsd (original)
+++ jakarta/turbine/stratum/trunk/src/test-conf/Scheduler.xsd Mon Aug 29
10:42:06 2005
@@ -133,4 +133,4 @@
<xsd:element name = "type" type = "xsd:string"/>
<xsd:element name = "jobName" type = "xsd:string"/>
<xsd:element name = "jobGroup" type = "xsd:string"/>
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
Modified:
jakarta/turbine/stratum/trunk/src/test-conf/TestComponentLoader.properties
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/stratum/trunk/src/test-conf/TestComponentLoader.properties?rev=264175&r1=264174&r2=264175&view=diff
==============================================================================
--- jakarta/turbine/stratum/trunk/src/test-conf/TestComponentLoader.properties
(original)
+++ jakarta/turbine/stratum/trunk/src/test-conf/TestComponentLoader.properties
Mon Aug 29 10:42:06 2005
@@ -14,4 +14,4 @@
# limitations under the License.
foo=bar
-plugh=xyzzy
\ No newline at end of file
+plugh=xyzzy
Modified:
jakarta/turbine/stratum/trunk/src/test/org/apache/stratum/component/TestComponentLoader.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/stratum/trunk/src/test/org/apache/stratum/component/TestComponentLoader.java?rev=264175&r1=264174&r2=264175&view=diff
==============================================================================
---
jakarta/turbine/stratum/trunk/src/test/org/apache/stratum/component/TestComponentLoader.java
(original)
+++
jakarta/turbine/stratum/trunk/src/test/org/apache/stratum/component/TestComponentLoader.java
Mon Aug 29 10:42:06 2005
@@ -30,7 +30,7 @@
private static String CONFIG = "src/test-conf/ComponentLoader.properties";
private static Configuration config;
- static
+ static
{
try
{
Modified:
jakarta/turbine/stratum/trunk/src/test/org/apache/stratum/messenger/MessengerComponentTest.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/stratum/trunk/src/test/org/apache/stratum/messenger/MessengerComponentTest.java?rev=264175&r1=264174&r2=264175&view=diff
==============================================================================
---
jakarta/turbine/stratum/trunk/src/test/org/apache/stratum/messenger/MessengerComponentTest.java
(original)
+++
jakarta/turbine/stratum/trunk/src/test/org/apache/stratum/messenger/MessengerComponentTest.java
Mon Aug 29 10:42:06 2005
@@ -115,7 +115,7 @@
private ExpectationValue getStringValue =
new ExpectationValue("mockConfiguration.getString");
private String getStringReturnValue = null;
-
+
public void setExpectedGetStringCalls(int callCount)
{
getStringCalls.setExpected(callCount);
@@ -128,12 +128,12 @@
{
getStringReturnValue = getString;
}
-
+
public void verify()
{
Verifier.verifyObject(this);
}
-
+
public String getString(String key)
{
getStringCalls.inc();
Modified:
jakarta/turbine/stratum/trunk/src/test/org/apache/stratum/scheduler/TestScheduler.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/stratum/trunk/src/test/org/apache/stratum/scheduler/TestScheduler.java?rev=264175&r1=264174&r2=264175&view=diff
==============================================================================
---
jakarta/turbine/stratum/trunk/src/test/org/apache/stratum/scheduler/TestScheduler.java
(original)
+++
jakarta/turbine/stratum/trunk/src/test/org/apache/stratum/scheduler/TestScheduler.java
Mon Aug 29 10:42:06 2005
@@ -39,24 +39,24 @@
* @version $Id$
*/
public class TestScheduler extends TestCase {
-
+
private static final String XML = "src/test-conf/Scheduler.xml";
- private static final String PROPERTIES =
+ private static final String PROPERTIES =
"src/test-conf/Scheduler.properties";
public static void main( String[] args ) {
TestRunner.run( suite() );
}
-
+
public static Test suite() {
return new TestSuite(TestScheduler.class);
}
-
+
public TestScheduler(String testName) {
super(testName);
}
-
- public void testLoadXmlConfig() throws Exception
+
+ public void testLoadXmlConfig() throws Exception
{
SchedulerConfig schedConf = new SchedulerConfig();
FileInputStream in = new FileInputStream(new File(XML));
@@ -64,14 +64,14 @@
// create a new BeanReader
BeanReader reader = createBeanReader();
- SchedulerConfig schedConf2 = (SchedulerConfig) reader.parse(in);
+ SchedulerConfig schedConf2 = (SchedulerConfig) reader.parse(in);
assertNotNull("scheduler should not be null.", schedConf2);
- assertEquals("there should be 2 job configurations",
- 2,
+ assertEquals("there should be 2 job configurations",
+ 2,
schedConf2.getJobConfigs().size());
- assertEquals("there should be 2 triggers",
- 2,
+ assertEquals("there should be 2 triggers",
+ 2,
schedConf2.getTriggerConfigs().size());
assertTrue("scheduler name should be scheduler1",
schedConf2.getInstanceName().equals("scheduler1"));
@@ -86,24 +86,24 @@
Scheduler sched = new Scheduler();
PropertiesConfiguration conf = new PropertiesConfiguration(PROPERTIES);
sched.configure(conf);
-
- try
+
+ try
{
sched.start();
Thread.currentThread().sleep(5000);
sched.stop();
}
- catch (InterruptedException e)
+ catch (InterruptedException e)
{
e.printStackTrace();
}
-
+
}
// Implementation methods
-
//-------------------------------------------------------------------------
-
+ //-------------------------------------------------------------------------
+
protected BeanReader createBeanReader() throws Exception {
BeanReader reader = new BeanReader();
reader.setXMLIntrospector( createXMLIntrospector() );
@@ -111,20 +111,20 @@
return reader;
}
- /**
+ /**
* ### it would be really nice to move this somewhere shareable across
* Maven / Turbine projects. Maybe a static helper method - question is
* what to call it???
*/
- protected XMLIntrospector createXMLIntrospector() {
+ protected XMLIntrospector createXMLIntrospector() {
XMLIntrospector introspector = new XMLIntrospector();
-
+
// set elements for attributes to true
introspector.setAttributesForPrimitives(false);
-
+
// wrap collections in an XML element
//introspector.setWrapCollectionsInElement(true);
-
+
// turn bean elements first letter into lower case
introspector.setNameMapper( new DecapitalizeNameMapper() );
Modified:
jakarta/turbine/stratum/trunk/src/test/org/apache/stratum/scheduler/examplejobs/JobOne.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/stratum/trunk/src/test/org/apache/stratum/scheduler/examplejobs/JobOne.java?rev=264175&r1=264174&r2=264175&view=diff
==============================================================================
---
jakarta/turbine/stratum/trunk/src/test/org/apache/stratum/scheduler/examplejobs/JobOne.java
(original)
+++
jakarta/turbine/stratum/trunk/src/test/org/apache/stratum/scheduler/examplejobs/JobOne.java
Mon Aug 29 10:42:06 2005
@@ -38,7 +38,7 @@
*
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
- public JobOne()
+ public JobOne()
{
}
@@ -59,7 +59,7 @@
public void execute(JobExecutionContext context)
throws JobExecutionException
{
- System.out.println(" --- Testing Scheduler Component\n --- "
+ System.out.println(" --- Testing Scheduler Component\n --- "
+ context.getJobDetail().getFullName() + " executed.[" + new
Date() + "]");
}
Modified:
jakarta/turbine/stratum/trunk/src/test/org/apache/stratum/scheduler/examplejobs/JobTwo.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/stratum/trunk/src/test/org/apache/stratum/scheduler/examplejobs/JobTwo.java?rev=264175&r1=264174&r2=264175&view=diff
==============================================================================
---
jakarta/turbine/stratum/trunk/src/test/org/apache/stratum/scheduler/examplejobs/JobTwo.java
(original)
+++
jakarta/turbine/stratum/trunk/src/test/org/apache/stratum/scheduler/examplejobs/JobTwo.java
Mon Aug 29 10:42:06 2005
@@ -37,7 +37,7 @@
*
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
- public JobTwo()
+ public JobTwo()
{
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
