Modified: turbine/core/trunk/src/java/org/apache/turbine/services/ui/UIService.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/ui/UIService.java?rev=1812628&r1=1812627&r2=1812628&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/ui/UIService.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/ui/UIService.java Thu Oct 19 12:34:25 2017 @@ -1,182 +1,182 @@ -package org.apache.turbine.services.ui; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import org.apache.turbine.services.Service; -import org.apache.turbine.util.ServerData; - -/** - * The UI service provides for shared access to User Interface (skin) files, - * as well as the ability for non-default skin files to inherit properties from - * a default skin. UITool is provided as a pull tool for accessing - * skin properties from your templates. - * - * <p>Skins are lazy loaded in that they are not loaded until first used. - * - * @author <a href="mailto:[email protected]";>Scott Eade</a> - * @version $Id$ - */ -public interface UIService extends Service -{ - /** - * The service identifier. - */ - public String SERVICE_NAME = "UIService"; - - /** - * Refresh all skins. - */ - public void refresh(); - - /** - * Refresh a particular skin. - * - * @param skinName the name of the skin to clear. - */ - public void refresh(String skinName); - - /** - * Provide access to the list of available skin names. - * - * @return the available skin names. - */ - public String[] getSkinNames(); - - /** - * Get the name of the default skin name for the web application from the - * TurbineResources.properties file. If the property is not present the - * name of the default skin will be returned. Note that the web application - * skin name may be something other than default, in which case its - * properties will default to the skin with the name "default". - * - * @return the name of the default skin for the web application. - */ - public String getWebappSkinName(); - - /** - * Retrieve a skin property from the named skin. If the property is not - * defined in the named skin the value for the default skin will be - * provided. If the named skin does not exist then the skin configured for - * the webapp will be used. If the webapp skin does not exist the default - * skin will be used. If the default skin does not exist then - * <code>null</code> will be returned. - * - * @param skinName the name of the skin to retrieve the property from. - * @param key the key to retrieve from the skin. - * @return the value of the property for the named skin (defaulting to the - * default skin), the webapp skin, the default skin or <code>null</code>, - * depending on whether or not the property or skins exist. - */ - public String get(String skinName, String key); - - /** - * Retrieve a skin property from the default skin for the webapp. If the - * property is not defined in the webapp skin the value for the default skin - * will be provided. If the webapp skin does not exist the default skin - * will be used. If the default skin does not exist then <code>null</code> - * will be returned. - * - * @param key the key to retrieve. - * @return the value of the property for the webapp skin (defaulting to the - * default skin), the default skin or <code>null</code>, depending on - * whether or not the property or skins exist. - */ - public String get(String key); - - /** - * Retrieve the URL for an image that is part of a skin. The images are - * stored in the WEBAPP/resources/ui/skins/[SKIN]/images directory. - * - * <p>Use this if for some reason your server name, server scheme, or server - * port change on a per request basis. I'm not sure if this would happen in - * a load balanced situation. I think in most cases the image(String image) - * method would probably be enough, but I'm not absolutely positive. - * - * @param skinName the name of the skin to retrieve the image from. - * @param imageId the id of the image whose URL will be generated. - * @param serverData the serverData to use as the basis for the URL. - * @return the image URL - */ - public String image(String skinName, String imageId, ServerData serverData); - - /** - * Retrieve the URL for an image that is part of a skin. The images are - * stored in the WEBAPP/resources/ui/skins/[SKIN]/images directory. - * - * @param skinName the name of the skin to retrieve the image from. - * @param imageId the id of the image whose URL will be generated. - * @return the image URL - */ - public String image(String skinName, String imageId); - - /** - * Retrieve the URL for the style sheet that is part of a skin. The style is - * stored in the WEBAPP/resources/ui/skins/[SKIN] directory with the - * filename skin.css - * - * <p>Use this if for some reason your server name, server scheme, or server - * port change on a per request basis. I'm not sure if this would happen in - * a load balanced situation. I think in most cases the style() method would - * probably be enough, but I'm not absolutely positive. - * - * @param skinName the name of the skin to retrieve the style sheet from. - * @param serverData the serverData to use as the basis for the URL. - * @return the CSS URL - */ - public String getStylecss(String skinName, ServerData serverData); - - /** - * Retrieve the URL for the style sheet that is part of a skin. The style is - * stored in the WEBAPP/resources/ui/skins/[SKIN] directory with the - * filename skin.css - * - * @param skinName the name of the skin to retrieve the style sheet from. - * @return the CSS URL - */ - public String getStylecss(String skinName); - - /** - * Retrieve the URL for a given script that is part of a skin. The script is - * stored in the WEBAPP/resources/ui/skins/[SKIN] directory. - * - * <p>Use this if for some reason your server name, server scheme, or server - * port change on a per request basis. I'm not sure if this would happen in - * a load balanced situation. I think in most cases the style() method would - * probably be enough, but I'm not absolutely positive. - * - * @param skinName the name of the skin to retrieve the image from. - * @param filename the name of the script file. - * @param serverData the serverData to use as the basis for the URL. - * @return the script URL - */ - public String getScript(String skinName, String filename, - ServerData serverData); - - /** - * Retrieve the URL for a given script that is part of a skin. The script is - * stored in the WEBAPP/resources/ui/skins/[SKIN] directory. - * - * @param skinName the name of the skin to retrieve the image from. - * @param filename the name of the script file. - * @return the script URL - */ - public String getScript(String skinName, String filename); - -} +package org.apache.turbine.services.ui; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.turbine.services.Service; +import org.apache.turbine.util.ServerData; + +/** + * The UI service provides for shared access to User Interface (skin) files, + * as well as the ability for non-default skin files to inherit properties from + * a default skin. UITool is provided as a pull tool for accessing + * skin properties from your templates. + * + * <p>Skins are lazy loaded in that they are not loaded until first used. + * + * @author <a href="mailto:[email protected]";>Scott Eade</a> + * @version $Id$ + */ +public interface UIService extends Service +{ + /** + * The service identifier. + */ + public String SERVICE_NAME = "UIService"; + + /** + * Refresh all skins. + */ + public void refresh(); + + /** + * Refresh a particular skin. + * + * @param skinName the name of the skin to clear. + */ + public void refresh(String skinName); + + /** + * Provide access to the list of available skin names. + * + * @return the available skin names. + */ + public String[] getSkinNames(); + + /** + * Get the name of the default skin name for the web application from the + * TurbineResources.properties file. If the property is not present the + * name of the default skin will be returned. Note that the web application + * skin name may be something other than default, in which case its + * properties will default to the skin with the name "default". + * + * @return the name of the default skin for the web application. + */ + public String getWebappSkinName(); + + /** + * Retrieve a skin property from the named skin. If the property is not + * defined in the named skin the value for the default skin will be + * provided. If the named skin does not exist then the skin configured for + * the webapp will be used. If the webapp skin does not exist the default + * skin will be used. If the default skin does not exist then + * <code>null</code> will be returned. + * + * @param skinName the name of the skin to retrieve the property from. + * @param key the key to retrieve from the skin. + * @return the value of the property for the named skin (defaulting to the + * default skin), the webapp skin, the default skin or <code>null</code>, + * depending on whether or not the property or skins exist. + */ + public String get(String skinName, String key); + + /** + * Retrieve a skin property from the default skin for the webapp. If the + * property is not defined in the webapp skin the value for the default skin + * will be provided. If the webapp skin does not exist the default skin + * will be used. If the default skin does not exist then <code>null</code> + * will be returned. + * + * @param key the key to retrieve. + * @return the value of the property for the webapp skin (defaulting to the + * default skin), the default skin or <code>null</code>, depending on + * whether or not the property or skins exist. + */ + public String get(String key); + + /** + * Retrieve the URL for an image that is part of a skin. The images are + * stored in the WEBAPP/resources/ui/skins/[SKIN]/images directory. + * + * <p>Use this if for some reason your server name, server scheme, or server + * port change on a per request basis. I'm not sure if this would happen in + * a load balanced situation. I think in most cases the image(String image) + * method would probably be enough, but I'm not absolutely positive. + * + * @param skinName the name of the skin to retrieve the image from. + * @param imageId the id of the image whose URL will be generated. + * @param serverData the serverData to use as the basis for the URL. + * @return the image URL + */ + public String image(String skinName, String imageId, ServerData serverData); + + /** + * Retrieve the URL for an image that is part of a skin. The images are + * stored in the WEBAPP/resources/ui/skins/[SKIN]/images directory. + * + * @param skinName the name of the skin to retrieve the image from. + * @param imageId the id of the image whose URL will be generated. + * @return the image URL + */ + public String image(String skinName, String imageId); + + /** + * Retrieve the URL for the style sheet that is part of a skin. The style is + * stored in the WEBAPP/resources/ui/skins/[SKIN] directory with the + * filename skin.css + * + * <p>Use this if for some reason your server name, server scheme, or server + * port change on a per request basis. I'm not sure if this would happen in + * a load balanced situation. I think in most cases the style() method would + * probably be enough, but I'm not absolutely positive. + * + * @param skinName the name of the skin to retrieve the style sheet from. + * @param serverData the serverData to use as the basis for the URL. + * @return the CSS URL + */ + public String getStylecss(String skinName, ServerData serverData); + + /** + * Retrieve the URL for the style sheet that is part of a skin. The style is + * stored in the WEBAPP/resources/ui/skins/[SKIN] directory with the + * filename skin.css + * + * @param skinName the name of the skin to retrieve the style sheet from. + * @return the CSS URL + */ + public String getStylecss(String skinName); + + /** + * Retrieve the URL for a given script that is part of a skin. The script is + * stored in the WEBAPP/resources/ui/skins/[SKIN] directory. + * + * <p>Use this if for some reason your server name, server scheme, or server + * port change on a per request basis. I'm not sure if this would happen in + * a load balanced situation. I think in most cases the style() method would + * probably be enough, but I'm not absolutely positive. + * + * @param skinName the name of the skin to retrieve the image from. + * @param filename the name of the script file. + * @param serverData the serverData to use as the basis for the URL. + * @return the script URL + */ + public String getScript(String skinName, String filename, + ServerData serverData); + + /** + * Retrieve the URL for a given script that is part of a skin. The script is + * stored in the WEBAPP/resources/ui/skins/[SKIN] directory. + * + * @param skinName the name of the skin to retrieve the image from. + * @param filename the name of the script file. + * @return the script URL + */ + public String getScript(String skinName, String filename); + +}
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/ui/package.html URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/ui/package.html?rev=1812628&r1=1812627&r2=1812628&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/services/ui/package.html (original) +++ turbine/core/trunk/src/java/org/apache/turbine/services/ui/package.html Thu Oct 19 12:34:25 2017 @@ -1,29 +1,29 @@ -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<html> -<head> -<!-- head part is ignored --> -</head> - -<body> -Provides skinning facilities for a Turbine web application. -<br> -<font size="-2">$Id$</font> -</body> -</html> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<html> +<head> +<!-- head part is ignored --> +</head> + +<body> +Provides skinning facilities for a Turbine web application. +<br> +<font size="-2">$Id$</font> +</body> +</html> Modified: turbine/core/trunk/src/java/org/apache/turbine/util/ObjectUtils.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/ObjectUtils.java?rev=1812628&r1=1812627&r2=1812628&view=diff ============================================================================== --- turbine/core/trunk/src/java/org/apache/turbine/util/ObjectUtils.java (original) +++ turbine/core/trunk/src/java/org/apache/turbine/util/ObjectUtils.java Thu Oct 19 12:34:25 2017 @@ -1,5 +1,23 @@ package org.apache.turbine.util; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; Modified: turbine/core/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/site/site.xml?rev=1812628&r1=1812627&r2=1812628&view=diff ============================================================================== --- turbine/core/trunk/src/site/site.xml (original) +++ turbine/core/trunk/src/site/site.xml Thu Oct 19 12:34:25 2017 @@ -29,7 +29,7 @@ <bannerRight> <src>/images/logo.gif</src> </bannerRight> - + <body> <menu name="General Information"> <item name="Overview" href="/index.html"/> Modified: turbine/core/trunk/src/test/org/apache/turbine/DestroyTest.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/DestroyTest.java?rev=1812628&r1=1812627&r2=1812628&view=diff ============================================================================== --- turbine/core/trunk/src/test/org/apache/turbine/DestroyTest.java (original) +++ turbine/core/trunk/src/test/org/apache/turbine/DestroyTest.java Thu Oct 19 12:34:25 2017 @@ -39,7 +39,7 @@ public class DestroyTest { private static TurbineConfig tc = null; - + @BeforeClass public static void init() throws Exception { tc = new TurbineConfig(".", "/conf/test/TemplateService.properties"); Modified: turbine/core/trunk/src/test/org/apache/turbine/annotation/AnnotationProcessorTest.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/annotation/AnnotationProcessorTest.java?rev=1812628&r1=1812627&r2=1812628&view=diff ============================================================================== --- turbine/core/trunk/src/test/org/apache/turbine/annotation/AnnotationProcessorTest.java (original) +++ turbine/core/trunk/src/test/org/apache/turbine/annotation/AnnotationProcessorTest.java Thu Oct 19 12:34:25 2017 @@ -1,129 +1,129 @@ -package org.apache.turbine.annotation; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; - -import java.util.List; - -import org.apache.commons.configuration.Configuration; -import org.apache.fulcrum.factory.FactoryService; -import org.apache.turbine.modules.Screen; -import org.apache.turbine.modules.ScreenLoader; -import org.apache.turbine.services.assemblerbroker.AssemblerBrokerService; -import org.apache.turbine.util.TurbineConfig; -import org.apache.turbine.util.TurbineException; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; - -/** - * Tests the various annotations - * - * @author <a href="mailto:[email protected]";>Thomas Vandahl</a> - */ -public class AnnotationProcessorTest -{ - private static TurbineConfig tc; - - @TurbineConfiguration - private Configuration completeConfiguration = null; - - @TurbineConfiguration("serverdata.default") - private Configuration serverdataDefaultConfiguration = null; - - @TurbineConfiguration("module.cache") - private boolean moduleCache = true; - - @TurbineConfiguration("action.cache.size") - private int actionCacheSize = 0; - - @TurbineConfiguration("template.homepage") - private String templateHomepage; - - @TurbineConfiguration("module.packages") - private List<String> modulePackages; - - @TurbineConfiguration("does.not.exist") - private long notModified = 1; - - @TurbineLoader(Screen.class) - private ScreenLoader screenLoader; - - @TurbineService - private AssemblerBrokerService asb; - - @TurbineService - private FactoryService factory; - - @BeforeClass - public static void init() throws Exception - { - tc = new TurbineConfig(".", "/conf/test/CompleteTurbineResources.properties"); - tc.initialize(); - } - - @AfterClass - public static void destroy() - throws Exception - { - tc.dispose(); - } - - @Test - public void testProcess() throws TurbineException - { - AnnotationProcessor.process(this); - - assertNotNull(completeConfiguration); - assertFalse(completeConfiguration.getBoolean("module.cache", true)); - - assertNotNull(serverdataDefaultConfiguration); - assertEquals(80, serverdataDefaultConfiguration.getInt("serverPort")); - - assertFalse(moduleCache); - assertEquals(20, actionCacheSize); - assertEquals("Index.vm", templateHomepage); - assertNotNull(modulePackages); - assertEquals(3, modulePackages.size()); - assertEquals("org.apache.turbine.services.template.modules", modulePackages.get(1)); - assertEquals(1, notModified); - - assertNotNull(screenLoader); - assertNotNull(asb); - assertNotNull(factory); - } - - @Ignore("For performance tests only") @Test - public void testProcessingPerformance() throws TurbineException - { - long startTime = System.currentTimeMillis(); - - for (int i = 0; i < 100000; i++) - { - AnnotationProcessor.process(this); - } - - System.out.println(System.currentTimeMillis() - startTime); - } -} +package org.apache.turbine.annotation; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; + +import java.util.List; + +import org.apache.commons.configuration.Configuration; +import org.apache.fulcrum.factory.FactoryService; +import org.apache.turbine.modules.Screen; +import org.apache.turbine.modules.ScreenLoader; +import org.apache.turbine.services.assemblerbroker.AssemblerBrokerService; +import org.apache.turbine.util.TurbineConfig; +import org.apache.turbine.util.TurbineException; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Ignore; +import org.junit.Test; + +/** + * Tests the various annotations + * + * @author <a href="mailto:[email protected]";>Thomas Vandahl</a> + */ +public class AnnotationProcessorTest +{ + private static TurbineConfig tc; + + @TurbineConfiguration + private Configuration completeConfiguration = null; + + @TurbineConfiguration("serverdata.default") + private Configuration serverdataDefaultConfiguration = null; + + @TurbineConfiguration("module.cache") + private boolean moduleCache = true; + + @TurbineConfiguration("action.cache.size") + private int actionCacheSize = 0; + + @TurbineConfiguration("template.homepage") + private String templateHomepage; + + @TurbineConfiguration("module.packages") + private List<String> modulePackages; + + @TurbineConfiguration("does.not.exist") + private long notModified = 1; + + @TurbineLoader(Screen.class) + private ScreenLoader screenLoader; + + @TurbineService + private AssemblerBrokerService asb; + + @TurbineService + private FactoryService factory; + + @BeforeClass + public static void init() throws Exception + { + tc = new TurbineConfig(".", "/conf/test/CompleteTurbineResources.properties"); + tc.initialize(); + } + + @AfterClass + public static void destroy() + throws Exception + { + tc.dispose(); + } + + @Test + public void testProcess() throws TurbineException + { + AnnotationProcessor.process(this); + + assertNotNull(completeConfiguration); + assertFalse(completeConfiguration.getBoolean("module.cache", true)); + + assertNotNull(serverdataDefaultConfiguration); + assertEquals(80, serverdataDefaultConfiguration.getInt("serverPort")); + + assertFalse(moduleCache); + assertEquals(20, actionCacheSize); + assertEquals("Index.vm", templateHomepage); + assertNotNull(modulePackages); + assertEquals(3, modulePackages.size()); + assertEquals("org.apache.turbine.services.template.modules", modulePackages.get(1)); + assertEquals(1, notModified); + + assertNotNull(screenLoader); + assertNotNull(asb); + assertNotNull(factory); + } + + @Ignore("For performance tests only") @Test + public void testProcessingPerformance() throws TurbineException + { + long startTime = System.currentTimeMillis(); + + for (int i = 0; i < 100000; i++) + { + AnnotationProcessor.process(this); + } + + System.out.println(System.currentTimeMillis() - startTime); + } +} Modified: turbine/core/trunk/src/test/org/apache/turbine/modules/GenericLoaderTest.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/modules/GenericLoaderTest.java?rev=1812628&r1=1812627&r2=1812628&view=diff ============================================================================== --- turbine/core/trunk/src/test/org/apache/turbine/modules/GenericLoaderTest.java (original) +++ turbine/core/trunk/src/test/org/apache/turbine/modules/GenericLoaderTest.java Thu Oct 19 12:34:25 2017 @@ -28,7 +28,7 @@ import org.junit.Test; public class GenericLoaderTest extends BaseTestCase { - + @Test public void testPackage() Modified: turbine/core/trunk/src/test/org/apache/turbine/services/LoadingComponentsTest.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/LoadingComponentsTest.java?rev=1812628&r1=1812627&r2=1812628&view=diff ============================================================================== --- turbine/core/trunk/src/test/org/apache/turbine/services/LoadingComponentsTest.java (original) +++ turbine/core/trunk/src/test/org/apache/turbine/services/LoadingComponentsTest.java Thu Oct 19 12:34:25 2017 @@ -163,5 +163,5 @@ public class LoadingComponentsTest exten tc.dispose(); } } - + } Modified: turbine/core/trunk/src/test/org/apache/turbine/services/crypto/FulcrumCryptoServiceTest.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/crypto/FulcrumCryptoServiceTest.java?rev=1812628&r1=1812627&r2=1812628&view=diff ============================================================================== --- turbine/core/trunk/src/test/org/apache/turbine/services/crypto/FulcrumCryptoServiceTest.java (original) +++ turbine/core/trunk/src/test/org/apache/turbine/services/crypto/FulcrumCryptoServiceTest.java Thu Oct 19 12:34:25 2017 @@ -91,7 +91,7 @@ public class FulcrumCryptoServiceTest ex tc.initialize(); } - + @Before public void setUpBefore() throws Exception { Modified: turbine/core/trunk/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java?rev=1812628&r1=1812627&r2=1812628&view=diff ============================================================================== --- turbine/core/trunk/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java (original) +++ turbine/core/trunk/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java Thu Oct 19 12:34:25 2017 @@ -1,163 +1,163 @@ -package org.apache.turbine.services.pull.tools; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.util.HashMap; -import java.util.Map; - -import org.apache.commons.lang.ArrayUtils; -import org.apache.turbine.TurbineConstants; -import org.apache.turbine.services.TurbineServices; -import org.apache.turbine.services.jsonrpc.JsonrpcServicelTest; -import org.apache.turbine.services.pull.PullService; -import org.apache.turbine.test.BaseTestCase; -import org.apache.turbine.util.TurbineConfig; -import org.apache.velocity.context.Context; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -@RunWith(Suite.class) [email protected]({ JsonrpcServicelTest.class }) -public class UIToolTest extends BaseTestCase -{ - - private static TurbineConfig turbineConfig = null; - private static PullService pullService = null; - private static UITool ui = null; - - @BeforeClass - public static void setUp() throws Exception - { - Map<String, String> initParams = new HashMap<String, String>(); - initParams.put(TurbineConfig.PROPERTIES_PATH_KEY, "/conf/test/CompleteTurbineResources.properties"); // "conf/test/TurbineResources.properties" - initParams.put(TurbineConstants.LOGGING_ROOT_KEY, "target/test-logs"); - - turbineConfig = new TurbineConfig(".", initParams); - turbineConfig.initialize(); - - pullService = (PullService)TurbineServices.getInstance().getService(PullService.SERVICE_NAME); - assertNotNull(pullService); - Context globalContext = pullService.getGlobalContext(); - assertNotNull(globalContext); - - ui = (UITool) globalContext.get("ui"); - } - - @AfterClass - public static void destroy() throws Exception - { - turbineConfig.dispose(); - ui = null; - } - - @Test - public void testTool() - { - assertNotNull(ui); - } - - @Test - public void testCssSlashes() - { - - ui.setSkin("myskin"); - - String cssUrl = ui.getStylecss(); - assertEquals("CSS URL does not match", "http:///conf/test/turbine-resources/turbine-skins/myskin/skins.css";, cssUrl); - } - - @Test - public void testImageSlashes() - { - ui.setSkin("myskin"); - - String img = "myimage.gif"; - - String imgUrl = ui.image(img); - assertEquals("CSS URL does not match", "http:///conf/test/turbine-resources/turbine-skins/myskin/turbine-images/"; + img, - imgUrl); - - String img2 = "foo/myimage.gif"; - - String imgUrl2 = ui.image(img2); - assertEquals("CSS URL does not match", "http:///conf/test/turbine-resources/turbine-skins/myskin/turbine-images/"; + img2, - imgUrl2); - - String img3 = "/foo/myimage.gif"; - - String imgUrl3 = ui.image(img3); - assertEquals("CSS URL does not match", "http:///conf/test/turbine-resources/turbine-skins/myskin/turbine-images"; + img3, - imgUrl3); - } - - @Test - public void testPathologicalCases() - { - ui.setSkin("myskin"); - - String img = ""; - String imgUrl = ui.image(img); - assertEquals("Could not strip empty String", "http:///conf/test/turbine-resources/turbine-skins/myskin/turbine-images/";, - imgUrl); - - img = "/"; - imgUrl = ui.image(img); - assertEquals("Could not strip single Slash", "http:///conf/test/turbine-resources/turbine-skins/myskin/turbine-images/";, - imgUrl); - - img = "//"; - imgUrl = ui.image(img); - assertEquals("Could not strip double Slash", "http:///conf/test/turbine-resources/turbine-skins/myskin/turbine-images/";, - imgUrl); - } - - @Test - public void testGetSkinNames() - { - - String[] skinNames = ui.getSkinNames(); - // Remove the ".svn" dir that may be present. - skinNames = (String[]) ArrayUtils.removeElement(skinNames, ".svn"); - assertEquals(2, skinNames.length); - - assertTrue(ArrayUtils.contains(skinNames, "myotherskin")); - assertTrue(ArrayUtils.contains(skinNames, "myskin")); - } - - @Test - public void testSkinValues() - { - - // Default skin - // skin_property_1 = skin_property_1_my_skin - assertEquals("skin_property_1_my_skin", ui.get("skin_property_1")); - - ui.setSkin("myotherskin"); - // skin_property_1 = skin_property_1_my_other_skin - assertEquals("skin_property_1_my_other_skin", ui.get("skin_property_1")); - } -} +package org.apache.turbine.services.pull.tools; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.util.HashMap; +import java.util.Map; + +import org.apache.commons.lang.ArrayUtils; +import org.apache.turbine.TurbineConstants; +import org.apache.turbine.services.TurbineServices; +import org.apache.turbine.services.jsonrpc.JsonrpcServicelTest; +import org.apache.turbine.services.pull.PullService; +import org.apache.turbine.test.BaseTestCase; +import org.apache.turbine.util.TurbineConfig; +import org.apache.velocity.context.Context; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +@RunWith(Suite.class) [email protected]({ JsonrpcServicelTest.class }) +public class UIToolTest extends BaseTestCase +{ + + private static TurbineConfig turbineConfig = null; + private static PullService pullService = null; + private static UITool ui = null; + + @BeforeClass + public static void setUp() throws Exception + { + Map<String, String> initParams = new HashMap<String, String>(); + initParams.put(TurbineConfig.PROPERTIES_PATH_KEY, "/conf/test/CompleteTurbineResources.properties"); // "conf/test/TurbineResources.properties" + initParams.put(TurbineConstants.LOGGING_ROOT_KEY, "target/test-logs"); + + turbineConfig = new TurbineConfig(".", initParams); + turbineConfig.initialize(); + + pullService = (PullService)TurbineServices.getInstance().getService(PullService.SERVICE_NAME); + assertNotNull(pullService); + Context globalContext = pullService.getGlobalContext(); + assertNotNull(globalContext); + + ui = (UITool) globalContext.get("ui"); + } + + @AfterClass + public static void destroy() throws Exception + { + turbineConfig.dispose(); + ui = null; + } + + @Test + public void testTool() + { + assertNotNull(ui); + } + + @Test + public void testCssSlashes() + { + + ui.setSkin("myskin"); + + String cssUrl = ui.getStylecss(); + assertEquals("CSS URL does not match", "http:///conf/test/turbine-resources/turbine-skins/myskin/skins.css";, cssUrl); + } + + @Test + public void testImageSlashes() + { + ui.setSkin("myskin"); + + String img = "myimage.gif"; + + String imgUrl = ui.image(img); + assertEquals("CSS URL does not match", "http:///conf/test/turbine-resources/turbine-skins/myskin/turbine-images/"; + img, + imgUrl); + + String img2 = "foo/myimage.gif"; + + String imgUrl2 = ui.image(img2); + assertEquals("CSS URL does not match", "http:///conf/test/turbine-resources/turbine-skins/myskin/turbine-images/"; + img2, + imgUrl2); + + String img3 = "/foo/myimage.gif"; + + String imgUrl3 = ui.image(img3); + assertEquals("CSS URL does not match", "http:///conf/test/turbine-resources/turbine-skins/myskin/turbine-images"; + img3, + imgUrl3); + } + + @Test + public void testPathologicalCases() + { + ui.setSkin("myskin"); + + String img = ""; + String imgUrl = ui.image(img); + assertEquals("Could not strip empty String", "http:///conf/test/turbine-resources/turbine-skins/myskin/turbine-images/";, + imgUrl); + + img = "/"; + imgUrl = ui.image(img); + assertEquals("Could not strip single Slash", "http:///conf/test/turbine-resources/turbine-skins/myskin/turbine-images/";, + imgUrl); + + img = "//"; + imgUrl = ui.image(img); + assertEquals("Could not strip double Slash", "http:///conf/test/turbine-resources/turbine-skins/myskin/turbine-images/";, + imgUrl); + } + + @Test + public void testGetSkinNames() + { + + String[] skinNames = ui.getSkinNames(); + // Remove the ".svn" dir that may be present. + skinNames = (String[]) ArrayUtils.removeElement(skinNames, ".svn"); + assertEquals(2, skinNames.length); + + assertTrue(ArrayUtils.contains(skinNames, "myotherskin")); + assertTrue(ArrayUtils.contains(skinNames, "myskin")); + } + + @Test + public void testSkinValues() + { + + // Default skin + // skin_property_1 = skin_property_1_my_skin + assertEquals("skin_property_1_my_skin", ui.get("skin_property_1")); + + ui.setSkin("myotherskin"); + // skin_property_1 = skin_property_1_my_other_skin + assertEquals("skin_property_1_my_other_skin", ui.get("skin_property_1")); + } +} Modified: turbine/core/trunk/src/test/org/apache/turbine/services/pull/util/DateFormatterTest.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/pull/util/DateFormatterTest.java?rev=1812628&r1=1812627&r2=1812628&view=diff ============================================================================== --- turbine/core/trunk/src/test/org/apache/turbine/services/pull/util/DateFormatterTest.java (original) +++ turbine/core/trunk/src/test/org/apache/turbine/services/pull/util/DateFormatterTest.java Thu Oct 19 12:34:25 2017 @@ -33,7 +33,7 @@ import static org.junit.Assert.*; * @author <a href="mailto:[email protected]";>Scott Eade</a> * @version $Id$ */ -public class DateFormatterTest +public class DateFormatterTest { // /* Modified: turbine/core/trunk/src/test/org/apache/turbine/services/rundata/DefaultTurbineRunDataTest.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/rundata/DefaultTurbineRunDataTest.java?rev=1812628&r1=1812627&r2=1812628&view=diff ============================================================================== --- turbine/core/trunk/src/test/org/apache/turbine/services/rundata/DefaultTurbineRunDataTest.java (original) +++ turbine/core/trunk/src/test/org/apache/turbine/services/rundata/DefaultTurbineRunDataTest.java Thu Oct 19 12:34:25 2017 @@ -58,7 +58,7 @@ public class DefaultTurbineRunDataTest e "/conf/test/TestFulcrumComponents.properties"); tc.initialize(); } - @AfterClass + @AfterClass public static void tearDown() throws Exception { if (tc != null) Modified: turbine/core/trunk/src/test/org/apache/turbine/services/schedule/JobEntryTest.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/schedule/JobEntryTest.java?rev=1812628&r1=1812627&r2=1812628&view=diff ============================================================================== --- turbine/core/trunk/src/test/org/apache/turbine/services/schedule/JobEntryTest.java (original) +++ turbine/core/trunk/src/test/org/apache/turbine/services/schedule/JobEntryTest.java Thu Oct 19 12:34:25 2017 @@ -1,65 +1,65 @@ -package org.apache.turbine.services.schedule; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; - -import org.junit.Before; -import org.junit.Test; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/** - * Unit testing for Job Entries. Ensure that removing NumberKey from TurbineNonPersistentScheduler - * still works. - * - * @author <a href="mailto:[email protected]";>Eric Pugh</a> - * @version $Id: JobEntryTest.java 615328 2008-01-25 20:25:05Z tv $ - */ -public class JobEntryTest -{ - - private JobEntry je1; - private JobEntry je2; - - @Before - public void setUpBefore() throws Exception - { - - // Add a new job entry - je1 = new JobEntryNonPersistent(); - je1.setJobId(1); - - je2 = new JobEntryNonPersistent(); - je2.setJobId(2); - } - - - /** - * Tests if the job entries are comparable - */ - @Test public void testCompareTo() - { - assertNotEquals(je1.compareTo(je2), 0); - je2.setJobId(je1.getJobId()); - assertEquals(je1.compareTo(je2), 0); - - } - -} +package org.apache.turbine.services.schedule; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; + +import org.junit.Before; +import org.junit.Test; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/** + * Unit testing for Job Entries. Ensure that removing NumberKey from TurbineNonPersistentScheduler + * still works. + * + * @author <a href="mailto:[email protected]";>Eric Pugh</a> + * @version $Id: JobEntryTest.java 615328 2008-01-25 20:25:05Z tv $ + */ +public class JobEntryTest +{ + + private JobEntry je1; + private JobEntry je2; + + @Before + public void setUpBefore() throws Exception + { + + // Add a new job entry + je1 = new JobEntryNonPersistent(); + je1.setJobId(1); + + je2 = new JobEntryNonPersistent(); + je2.setJobId(2); + } + + + /** + * Tests if the job entries are comparable + */ + @Test public void testCompareTo() + { + assertNotEquals(je1.compareTo(je2), 0); + je2.setJobId(je1.getJobId()); + assertEquals(je1.compareTo(je2), 0); + + } + +} Modified: turbine/core/trunk/src/test/org/apache/turbine/services/schedule/QuartzSchedulerServiceTest.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/schedule/QuartzSchedulerServiceTest.java?rev=1812628&r1=1812627&r2=1812628&view=diff ============================================================================== --- turbine/core/trunk/src/test/org/apache/turbine/services/schedule/QuartzSchedulerServiceTest.java (original) +++ turbine/core/trunk/src/test/org/apache/turbine/services/schedule/QuartzSchedulerServiceTest.java Thu Oct 19 12:34:25 2017 @@ -1,163 +1,163 @@ -package org.apache.turbine.services.schedule; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - - - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import org.apache.turbine.modules.scheduledjobs.SimpleJob; -import org.apache.turbine.services.TurbineServices; -import org.apache.turbine.test.BaseTestCase; -import org.apache.turbine.util.TurbineConfig; -import org.apache.turbine.util.TurbineException; -import org.hamcrest.CoreMatchers; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.quartz.JobKey; - -/** - * Unit testing for the quartz implementation of the scheduler service. - * - * @author <a href="mailto:[email protected]";>Thomas Vandahl</a> - */ -public class QuartzSchedulerServiceTest extends BaseTestCase -{ - private TurbineConfig tc = null; - - private ScheduleService scheduler = null; - - @Before - public void setUp() throws Exception - { - tc = - new TurbineConfig( - ".", - "/conf/test/TestFulcrumComponents.properties"); - tc.initialize(); - - scheduler = (ScheduleService)TurbineServices.getInstance().getService(ScheduleService.SERVICE_NAME); - } - - @After - public void tearDown() throws Exception - { - if (tc != null) - { - tc.dispose(); - } - } - - /** - * Tests the ability to enable and disable the service. - */ - @Test public void testEnableDisable() - { - try - { - scheduler.startScheduler(); - assertTrue(scheduler.isEnabled()); - - scheduler.stopScheduler(); - assertFalse(scheduler.isEnabled()); - } - catch (Exception e) - { - e.printStackTrace(); - fail(); - } - } - - /** - * Tests the ability to add and remove a job. A list of jobs will be obtained from - * the service to determine if the operation were successful. - */ - @Test public void testAddRemoveJob() - { - try - { - // get the current job count for later comparison - int jobCount = scheduler.listJobs().size(); - - // Add a new job entry - JobEntry je = scheduler.newJob(10, -1, -1, -1, -1, "SimpleJob1"); - je.setJobId(jobCount + 1); - - scheduler.addJob(je); - assertEquals(jobCount + 1, scheduler.listJobs().size()); - - scheduler.removeJob(je); - assertEquals(jobCount, scheduler.listJobs().size()); - - } - catch (Exception e) - { - e.printStackTrace(); - fail(); - } - } - - /** - * Tests the ability to retrieve the job added during initialization. - */ - @Test public void testGetJob() - { - try - { - JobKey jk = new JobKey("SimpleJob", JobEntryQuartz.DEFAULT_JOB_GROUP_NAME); - JobEntry je = scheduler.getJob(jk.hashCode()); - assertThat(je, CoreMatchers.instanceOf(JobEntryQuartz.class)); - JobEntryQuartz jeq = (JobEntryQuartz)je; - assertEquals(jeq.getJobTrigger().getJobKey(), jk); - assertEquals(jeq.getTask(), "SimpleJob"); - } - catch (TurbineException e) - { - e.printStackTrace(); - fail(); - } - } - - /** - * Test to make sure a job actually runs. - */ - @Test public void testRunningJob() - { - try - { - int beforeCount = SimpleJob.getCounter(); - Thread.sleep(1200); - int afterCount = SimpleJob.getCounter(); - assertTrue(beforeCount < afterCount); - - } - catch (Exception e) - { - e.printStackTrace(); - fail(); - } - } - -} +package org.apache.turbine.services.schedule; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + + + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import org.apache.turbine.modules.scheduledjobs.SimpleJob; +import org.apache.turbine.services.TurbineServices; +import org.apache.turbine.test.BaseTestCase; +import org.apache.turbine.util.TurbineConfig; +import org.apache.turbine.util.TurbineException; +import org.hamcrest.CoreMatchers; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.quartz.JobKey; + +/** + * Unit testing for the quartz implementation of the scheduler service. + * + * @author <a href="mailto:[email protected]";>Thomas Vandahl</a> + */ +public class QuartzSchedulerServiceTest extends BaseTestCase +{ + private TurbineConfig tc = null; + + private ScheduleService scheduler = null; + + @Before + public void setUp() throws Exception + { + tc = + new TurbineConfig( + ".", + "/conf/test/TestFulcrumComponents.properties"); + tc.initialize(); + + scheduler = (ScheduleService)TurbineServices.getInstance().getService(ScheduleService.SERVICE_NAME); + } + + @After + public void tearDown() throws Exception + { + if (tc != null) + { + tc.dispose(); + } + } + + /** + * Tests the ability to enable and disable the service. + */ + @Test public void testEnableDisable() + { + try + { + scheduler.startScheduler(); + assertTrue(scheduler.isEnabled()); + + scheduler.stopScheduler(); + assertFalse(scheduler.isEnabled()); + } + catch (Exception e) + { + e.printStackTrace(); + fail(); + } + } + + /** + * Tests the ability to add and remove a job. A list of jobs will be obtained from + * the service to determine if the operation were successful. + */ + @Test public void testAddRemoveJob() + { + try + { + // get the current job count for later comparison + int jobCount = scheduler.listJobs().size(); + + // Add a new job entry + JobEntry je = scheduler.newJob(10, -1, -1, -1, -1, "SimpleJob1"); + je.setJobId(jobCount + 1); + + scheduler.addJob(je); + assertEquals(jobCount + 1, scheduler.listJobs().size()); + + scheduler.removeJob(je); + assertEquals(jobCount, scheduler.listJobs().size()); + + } + catch (Exception e) + { + e.printStackTrace(); + fail(); + } + } + + /** + * Tests the ability to retrieve the job added during initialization. + */ + @Test public void testGetJob() + { + try + { + JobKey jk = new JobKey("SimpleJob", JobEntryQuartz.DEFAULT_JOB_GROUP_NAME); + JobEntry je = scheduler.getJob(jk.hashCode()); + assertThat(je, CoreMatchers.instanceOf(JobEntryQuartz.class)); + JobEntryQuartz jeq = (JobEntryQuartz)je; + assertEquals(jeq.getJobTrigger().getJobKey(), jk); + assertEquals(jeq.getTask(), "SimpleJob"); + } + catch (TurbineException e) + { + e.printStackTrace(); + fail(); + } + } + + /** + * Test to make sure a job actually runs. + */ + @Test public void testRunningJob() + { + try + { + int beforeCount = SimpleJob.getCounter(); + Thread.sleep(1200); + int afterCount = SimpleJob.getCounter(); + assertTrue(beforeCount < afterCount); + + } + catch (Exception e) + { + e.printStackTrace(); + fail(); + } + } + +} Modified: turbine/core/trunk/src/test/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerServiceTest.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerServiceTest.java?rev=1812628&r1=1812627&r2=1812628&view=diff ============================================================================== --- turbine/core/trunk/src/test/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerServiceTest.java (original) +++ turbine/core/trunk/src/test/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerServiceTest.java Thu Oct 19 12:34:25 2017 @@ -1,167 +1,167 @@ -package org.apache.turbine.services.schedule; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - - - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import org.apache.turbine.modules.scheduledjobs.SimpleJob; -import org.apache.turbine.services.TurbineServices; -import org.apache.turbine.util.TurbineConfig; -import org.apache.turbine.util.TurbineException; -import org.hamcrest.CoreMatchers; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/** - * Unit testing for the non-persistent implementation of the scheduler service. - * - * @author <a href="mailto:[email protected]";>Quinton McCombs</a> - * @version $Id: TurbineNonPersistentSchedulerServiceTest.java 615328 2008-01-25 20:25:05Z tv $ - */ -public class TurbineNonPersistentSchedulerServiceTest -{ - private TurbineConfig tc = null; - - private ScheduleService scheduler = null; - - @Before - public void setUp() throws Exception - { - tc = - new TurbineConfig( - ".", - "/conf/test/TurbineNonPersistentSchedulerServiceTest.properties"); - tc.initialize(); - - scheduler = (ScheduleService)TurbineServices.getInstance().getService(ScheduleService.SERVICE_NAME); - } - - @After - public void tearDown() throws Exception - { - if (tc != null) - { - tc.dispose(); - } - } - - /** - * Tests the ability to enable and disable the service. - */ - @Test public void testEnableDisable() - { - try - { - scheduler.startScheduler(); - assertTrue(scheduler.isEnabled()); - - scheduler.stopScheduler(); - assertFalse(scheduler.isEnabled()); - } - catch (Exception e) - { - e.printStackTrace(); - fail(); - } - } - - /** - * Tests the ability to add and remove a job. A list of jobs will be obtained from - * the service to determine if the operation were successful. - */ - @Test public void testAddRemoveJob() - { - try - { - // get the current job count for later comparison - int jobCount = scheduler.listJobs().size(); - - // Add a new job entry - JobEntry je = scheduler.newJob(0, 1, -1, -1, -1, "SimpleJob"); - - scheduler.addJob(je); - assertEquals(jobCount + 1, scheduler.listJobs().size()); - - assertTrue(scheduler.listJobs().contains( je )); - scheduler.removeJob(je); - assertTrue(!scheduler.listJobs().contains( je )); - assertEquals(jobCount, scheduler.listJobs().size()); - - } - catch (Exception e) - { - e.printStackTrace(); - fail(); - } - } - - /** - * Tests the ability to retrieve the job added during initialization. - */ - @Test public void testGetJob() - { - try - { - JobEntry je = scheduler.getJob(1); - assertThat(je, CoreMatchers.instanceOf(JobEntryNonPersistent.class)); - JobEntryNonPersistent jenp = (JobEntryNonPersistent)je; - assertEquals(1, jenp.getJobId()); - assertEquals(1, jenp.getSecond()); - assertEquals(-1, jenp.getMinute()); - assertEquals(-1, jenp.getHour()); - assertEquals(-1, jenp.getDayOfMonth()); - assertEquals(-1, jenp.getWeekDay()); - assertEquals("SimpleJob", jenp.getTask()); - } - catch (TurbineException e) - { - e.printStackTrace(); - fail(); - } - } - - /** - * Test to make sure a job actually runs. - */ - @Test public void testRunningJob() - { - try - { - int beforeCount = SimpleJob.getCounter(); - Thread.sleep(1200); - int afterCount = SimpleJob.getCounter(); - assertTrue(beforeCount < afterCount); - - } - catch (Exception e) - { - e.printStackTrace(); - fail(); - } - } - -} +package org.apache.turbine.services.schedule; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + + + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import org.apache.turbine.modules.scheduledjobs.SimpleJob; +import org.apache.turbine.services.TurbineServices; +import org.apache.turbine.util.TurbineConfig; +import org.apache.turbine.util.TurbineException; +import org.hamcrest.CoreMatchers; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +/** + * Unit testing for the non-persistent implementation of the scheduler service. + * + * @author <a href="mailto:[email protected]";>Quinton McCombs</a> + * @version $Id: TurbineNonPersistentSchedulerServiceTest.java 615328 2008-01-25 20:25:05Z tv $ + */ +public class TurbineNonPersistentSchedulerServiceTest +{ + private TurbineConfig tc = null; + + private ScheduleService scheduler = null; + + @Before + public void setUp() throws Exception + { + tc = + new TurbineConfig( + ".", + "/conf/test/TurbineNonPersistentSchedulerServiceTest.properties"); + tc.initialize(); + + scheduler = (ScheduleService)TurbineServices.getInstance().getService(ScheduleService.SERVICE_NAME); + } + + @After + public void tearDown() throws Exception + { + if (tc != null) + { + tc.dispose(); + } + } + + /** + * Tests the ability to enable and disable the service. + */ + @Test public void testEnableDisable() + { + try + { + scheduler.startScheduler(); + assertTrue(scheduler.isEnabled()); + + scheduler.stopScheduler(); + assertFalse(scheduler.isEnabled()); + } + catch (Exception e) + { + e.printStackTrace(); + fail(); + } + } + + /** + * Tests the ability to add and remove a job. A list of jobs will be obtained from + * the service to determine if the operation were successful. + */ + @Test public void testAddRemoveJob() + { + try + { + // get the current job count for later comparison + int jobCount = scheduler.listJobs().size(); + + // Add a new job entry + JobEntry je = scheduler.newJob(0, 1, -1, -1, -1, "SimpleJob"); + + scheduler.addJob(je); + assertEquals(jobCount + 1, scheduler.listJobs().size()); + + assertTrue(scheduler.listJobs().contains( je )); + scheduler.removeJob(je); + assertTrue(!scheduler.listJobs().contains( je )); + assertEquals(jobCount, scheduler.listJobs().size()); + + } + catch (Exception e) + { + e.printStackTrace(); + fail(); + } + } + + /** + * Tests the ability to retrieve the job added during initialization. + */ + @Test public void testGetJob() + { + try + { + JobEntry je = scheduler.getJob(1); + assertThat(je, CoreMatchers.instanceOf(JobEntryNonPersistent.class)); + JobEntryNonPersistent jenp = (JobEntryNonPersistent)je; + assertEquals(1, jenp.getJobId()); + assertEquals(1, jenp.getSecond()); + assertEquals(-1, jenp.getMinute()); + assertEquals(-1, jenp.getHour()); + assertEquals(-1, jenp.getDayOfMonth()); + assertEquals(-1, jenp.getWeekDay()); + assertEquals("SimpleJob", jenp.getTask()); + } + catch (TurbineException e) + { + e.printStackTrace(); + fail(); + } + } + + /** + * Test to make sure a job actually runs. + */ + @Test public void testRunningJob() + { + try + { + int beforeCount = SimpleJob.getCounter(); + Thread.sleep(1200); + int afterCount = SimpleJob.getCounter(); + assertTrue(beforeCount < afterCount); + + } + catch (Exception e) + { + e.printStackTrace(); + fail(); + } + } + +} Modified: turbine/core/trunk/src/test/org/apache/turbine/services/security/SecurityServiceTest.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/security/SecurityServiceTest.java?rev=1812628&r1=1812627&r2=1812628&view=diff ============================================================================== --- turbine/core/trunk/src/test/org/apache/turbine/services/security/SecurityServiceTest.java (original) +++ turbine/core/trunk/src/test/org/apache/turbine/services/security/SecurityServiceTest.java Thu Oct 19 12:34:25 2017 @@ -43,7 +43,7 @@ import org.junit.Test; /** * Test that the SecurityService works properly by comparing behaviour of Turbine and Fulcrum security services using memory user manager. - * + * * Code adapted from SecurityServiceAdapter in Fulcrum Security Adapter * * @author gkallidis @@ -52,12 +52,12 @@ import org.junit.Test; public class SecurityServiceTest extends BaseUnit4Test { - + SecurityService fulcrumSecurityService; org.apache.turbine.services.security.SecurityService securityService; static TurbineConfig tc; - + @BeforeClass public static void init() throws Exception { @@ -65,19 +65,19 @@ public class SecurityServiceTest extends tc.initialize(); } - + @Before public void setUpBefore() throws Exception { - + ServiceManager serviceManager = TurbineServices.getInstance(); - // + // fulcrumSecurityService = (SecurityService) serviceManager.getService(SecurityService.ROLE); - + securityService = (org.apache.turbine.services.security.SecurityService) TurbineServices.getInstance().getService(org.apache.turbine.services.security.SecurityService.SERVICE_NAME); } - + @Test public void testAccountExists() throws Exception { @@ -101,13 +101,13 @@ public class SecurityServiceTest extends assertTrue(fulcrumSecurityService.getUserManager().checkExists(user)); } - + /** - * Tests Turbine and Fulcrum. - * + * Tests Turbine and Fulcrum. + * * Fulcrum part is similar/duplicated from {@link AbstractTurbineModelManagerTest#testGrantUserGroupRole()} - * - * + * + * * @throws Exception */ @Test @@ -119,32 +119,32 @@ public class SecurityServiceTest extends Role role = fulcrumSecurityService.getRoleManager().getRoleInstance(); role.setName("TEST_Role"); fulcrumSecurityService.getRoleManager().addRole(role); - + // Turbine security service returns a wrapped instance: org.apache.turbine.om.security.DefaultUserImpl // which implements org.apache.turbine.om.security.User and contains - User user = securityService.getUserInstance("Clint"); + User user = securityService.getUserInstance("Clint"); // memory securityService.addUser(user, "clint"); securityService.grant(user, group, role); - + addUserAndCheck(group, role, user); - + // Fulcrum security service returns a raw org.apache.fulcrum.security.model.turbine.entity.impl.TurbineUserImpl, org.apache.fulcrum.security.UserManager userManager = fulcrumSecurityService.getUserManager(); - org.apache.fulcrum.security.entity.User fulcrumUser = userManager.getUserInstance("Clint2"); + org.apache.fulcrum.security.entity.User fulcrumUser = userManager.getUserInstance("Clint2"); userManager.addUser(fulcrumUser, "clint2"); // memory ((TurbineModelManager)fulcrumSecurityService.getModelManager()).grant(fulcrumUser, group, role); - + addUserAndCheck(group, role, fulcrumUser); } /** - * Fulcrum contract check - * + * Fulcrum contract check + * * @param group Fulcrum interface * @param role Fulcrum interface - * @param user Fulcrum interface + * @param user Fulcrum interface * @throws EntityExistsException * @throws DataBackendException * @throws UnknownEntityException @@ -169,8 +169,8 @@ public class SecurityServiceTest extends assertTrue(ugrTest.getGroup().equals(group)); assertTrue(ugrTest.getUser().equals(user)); } - - + + @AfterClass public static void setupAfter() { Modified: turbine/core/trunk/src/test/org/apache/turbine/services/security/TurbineDefaultModelManagerTest.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/security/TurbineDefaultModelManagerTest.java?rev=1812628&r1=1812627&r2=1812628&view=diff ============================================================================== --- turbine/core/trunk/src/test/org/apache/turbine/services/security/TurbineDefaultModelManagerTest.java (original) +++ turbine/core/trunk/src/test/org/apache/turbine/services/security/TurbineDefaultModelManagerTest.java Thu Oct 19 12:34:25 2017 @@ -26,10 +26,10 @@ import org.junit.Before; import org.junit.Test; /** - * Test Fulcrum Integration. - * - * Stub for further tests, relying on Fulcrum. - * + * Test Fulcrum Integration. + * + * Stub for further tests, relying on Fulcrum. + * * @author gkallidis * @version $Id:$ */ @@ -55,13 +55,13 @@ public class TurbineDefaultModelManagerT } } - + @Test public void testDummy() { // all tests in abstract } - - + + @Override @After Modified: turbine/core/trunk/src/test/org/apache/turbine/services/template/ClassTest.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/template/ClassTest.java?rev=1812628&r1=1812627&r2=1812628&view=diff ============================================================================== --- turbine/core/trunk/src/test/org/apache/turbine/services/template/ClassTest.java (original) +++ turbine/core/trunk/src/test/org/apache/turbine/services/template/ClassTest.java Thu Oct 19 12:34:25 2017 @@ -44,7 +44,7 @@ public class ClassTest private static TurbineConfig tc = null; private static TemplateService ts = null; - + @BeforeClass public static void setUp() throws Exception { Modified: turbine/core/trunk/src/test/org/apache/turbine/services/template/TemplateTest.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/template/TemplateTest.java?rev=1812628&r1=1812627&r2=1812628&view=diff ============================================================================== --- turbine/core/trunk/src/test/org/apache/turbine/services/template/TemplateTest.java (original) +++ turbine/core/trunk/src/test/org/apache/turbine/services/template/TemplateTest.java Thu Oct 19 12:34:25 2017 @@ -45,7 +45,7 @@ public class TemplateTest private static TemplateService ts = null; - + @BeforeClass public static void setUp() throws Exception { Modified: turbine/core/trunk/src/test/org/apache/turbine/services/velocity/PathConverterTest.java URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/velocity/PathConverterTest.java?rev=1812628&r1=1812627&r2=1812628&view=diff ============================================================================== --- turbine/core/trunk/src/test/org/apache/turbine/services/velocity/PathConverterTest.java (original) +++ turbine/core/trunk/src/test/org/apache/turbine/services/velocity/PathConverterTest.java Thu Oct 19 12:34:25 2017 @@ -49,7 +49,7 @@ public class PathConverterTest private static VelocityService vs = null; private static String fileSeperator = System.getProperty("file.separator"); - + @BeforeClass public static void setUp() throws Exception { tc = new TurbineConfig(".", "/conf/test/TemplateService.properties"); Modified: turbine/core/trunk/src/torque/schema/id-table-schema.xml URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/torque/schema/id-table-schema.xml?rev=1812628&r1=1812627&r2=1812628&view=diff ============================================================================== --- turbine/core/trunk/src/torque/schema/id-table-schema.xml (original) +++ turbine/core/trunk/src/torque/schema/id-table-schema.xml Thu Oct 19 12:34:25 2017 @@ -33,7 +33,7 @@ defaultIdMethod="none" xmlns="http://db.apache.org/torque/4.0/templates/database"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database + xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database http://db.apache.org/torque/4.0/templates/database.xsd";> <table name="ID_TABLE" idMethod="idbroker"> Modified: turbine/core/trunk/src/torque/schema/scheduler-schema.xml URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/torque/schema/scheduler-schema.xml?rev=1812628&r1=1812627&r2=1812628&view=diff ============================================================================== --- turbine/core/trunk/src/torque/schema/scheduler-schema.xml (original) +++ turbine/core/trunk/src/torque/schema/scheduler-schema.xml Thu Oct 19 12:34:25 2017 @@ -1,59 +1,59 @@ -<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> - -<!-- ==================================================================== --> -<!-- --> -<!-- S C H E D U L E R T U R B I N E S C H E M A --> -<!-- --> -<!-- ==================================================================== --> -<!-- This is the the XML schema used by Torque to generate the necessary --> -<!-- sources used to create/initialize the Turbine scheduler service. --> -<!-- Torque will create the SQL for the database, and the Peer-based --> -<!-- Object Model. --> -<!-- ==================================================================== --> -<!-- @author: <a href="mailto:[email protected]";>Jason van Zyl</a> --> -<!-- @version $Id: scheduler-schema.xml 615328 2008-01-25 20:25:05Z tv $ --> -<!-- ==================================================================== --> - -<database name="default" - defaultIdMethod="none" - xmlns="http://db.apache.org/torque/4.0/templates/database"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database - http://db.apache.org/torque/4.0/templates/database.xsd";> - - - <table name="TURBINE_SCHEDULED_JOB" idMethod="idbroker" javaName="JobEntryTorque" - baseClass="org.apache.turbine.services.schedule.AbstractJobEntry" > - <column name="JOB_ID" required="true" primaryKey="true" type="INTEGER"/> - <column name="SECOND" javaName="Second" default="-1" - required="true" type="INTEGER"/> - <column name="MINUTE" javaName="Minute" default="-1" - required="true" type="INTEGER"/> - <column name="HOUR" javaName="Hour" default="-1" - required="true" type="INTEGER"/> - <column name="WEEK_DAY" default="-1" required="true" type="INTEGER"/> - <column name="DAY_OF_MONTH" default="-1" required="true" type="INTEGER"/> - <column name="TASK" required="true" size="99" type="VARCHAR"/> - <column name="EMAIL" size="99" type="VARCHAR"/> - <column name="PROPERTY" javaName="Property" type="VARBINARY"/> - </table> - -</database> +<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> + +<!-- ==================================================================== --> +<!-- --> +<!-- S C H E D U L E R T U R B I N E S C H E M A --> +<!-- --> +<!-- ==================================================================== --> +<!-- This is the the XML schema used by Torque to generate the necessary --> +<!-- sources used to create/initialize the Turbine scheduler service. --> +<!-- Torque will create the SQL for the database, and the Peer-based --> +<!-- Object Model. --> +<!-- ==================================================================== --> +<!-- @author: <a href="mailto:[email protected]";>Jason van Zyl</a> --> +<!-- @version $Id: scheduler-schema.xml 615328 2008-01-25 20:25:05Z tv $ --> +<!-- ==================================================================== --> + +<database name="default" + defaultIdMethod="none" + xmlns="http://db.apache.org/torque/4.0/templates/database"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database + http://db.apache.org/torque/4.0/templates/database.xsd";> + + + <table name="TURBINE_SCHEDULED_JOB" idMethod="idbroker" javaName="JobEntryTorque" + baseClass="org.apache.turbine.services.schedule.AbstractJobEntry" > + <column name="JOB_ID" required="true" primaryKey="true" type="INTEGER"/> + <column name="SECOND" javaName="Second" default="-1" + required="true" type="INTEGER"/> + <column name="MINUTE" javaName="Minute" default="-1" + required="true" type="INTEGER"/> + <column name="HOUR" javaName="Hour" default="-1" + required="true" type="INTEGER"/> + <column name="WEEK_DAY" default="-1" required="true" type="INTEGER"/> + <column name="DAY_OF_MONTH" default="-1" required="true" type="INTEGER"/> + <column name="TASK" required="true" size="99" type="VARCHAR"/> + <column name="EMAIL" size="99" type="VARCHAR"/> + <column name="PROPERTY" javaName="Property" type="VARBINARY"/> + </table> + +</database> Modified: turbine/core/trunk/xdocs/features.xml URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/features.xml?rev=1812628&r1=1812627&r2=1812628&view=diff ============================================================================== --- turbine/core/trunk/xdocs/features.xml (original) +++ turbine/core/trunk/xdocs/features.xml Thu Oct 19 12:34:25 2017 @@ -34,8 +34,8 @@ coolness. Turbine is well over 200 class features and API's. Many of these can also be used indepently of Turbine. Almost all of the default implementations can be easily overridden with your own implementations. Turbine also has extensive Javadoc documentation -for nearly all of the classes as well as in-code comments. It clearly has -been developed by the people who do web applications on a daily basis and +for nearly all of the classes as well as in-code comments. It clearly has +been developed by the people who do web applications on a daily basis and have to constantly solve the same problems over and over again. </p>
