Author: sgoeschl
Date: Tue Sep 20 21:18:19 2011
New Revision: 1173379
URL: http://svn.apache.org/viewvc?rev=1173379&view=rev
Log:
Cleaning up in order to cut an RC
Modified:
turbine/fulcrum/trunk/resourcemanager/LICENSE.txt
turbine/fulcrum/trunk/resourcemanager/pom.xml
turbine/fulcrum/trunk/resourcemanager/src/java/org/apache/fulcrum/resourcemanager/ResourceManager.java
turbine/fulcrum/trunk/resourcemanager/src/java/org/apache/fulcrum/resourcemanager/ResourceManagerService.java
turbine/fulcrum/trunk/resourcemanager/src/java/org/apache/fulcrum/resourcemanager/impl/BaseResourceManager.java
turbine/fulcrum/trunk/resourcemanager/src/java/org/apache/fulcrum/resourcemanager/impl/FileResourceManager.java
turbine/fulcrum/trunk/resourcemanager/src/java/org/apache/fulcrum/resourcemanager/impl/ResourceManagerServiceImpl.java
turbine/fulcrum/trunk/resourcemanager/src/test/org/apache/fulcrum/resourcemanager/ResourceManagerServiceTest.java
turbine/fulcrum/trunk/resourcemanager/xdocs/changes.xml
Modified: turbine/fulcrum/trunk/resourcemanager/LICENSE.txt
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/resourcemanager/LICENSE.txt?rev=1173379&r1=1173378&r2=1173379&view=diff
==============================================================================
--- turbine/fulcrum/trunk/resourcemanager/LICENSE.txt (original)
+++ turbine/fulcrum/trunk/resourcemanager/LICENSE.txt Tue Sep 20 21:18:19 2011
@@ -1,16 +1,202 @@
-/*
- * Copyright 2004 Apache Software Foundation
- * Licensed 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.
- */
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
Modified: turbine/fulcrum/trunk/resourcemanager/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/resourcemanager/pom.xml?rev=1173379&r1=1173378&r2=1173379&view=diff
==============================================================================
--- turbine/fulcrum/trunk/resourcemanager/pom.xml (original)
+++ turbine/fulcrum/trunk/resourcemanager/pom.xml Tue Sep 20 21:18:19 2011
@@ -60,13 +60,11 @@
</developers>
<dependencies>
- <!-- Avalon dependencies -->
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
<version>4.3.1</version>
</dependency>
- <!-- Fulcrum dependencies -->
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-pbe</artifactId>
Modified:
turbine/fulcrum/trunk/resourcemanager/src/java/org/apache/fulcrum/resourcemanager/ResourceManager.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/resourcemanager/src/java/org/apache/fulcrum/resourcemanager/ResourceManager.java?rev=1173379&r1=1173378&r2=1173379&view=diff
==============================================================================
---
turbine/fulcrum/trunk/resourcemanager/src/java/org/apache/fulcrum/resourcemanager/ResourceManager.java
(original)
+++
turbine/fulcrum/trunk/resourcemanager/src/java/org/apache/fulcrum/resourcemanager/ResourceManager.java
Tue Sep 20 21:18:19 2011
@@ -51,7 +51,7 @@ public interface ResourceManager
String getDomain();
/**
- * List all avaible resources recursively for a domain.
+ * List all available resources recursively for a domain.
*
* @return list of all available resources for the domain
*/
Modified:
turbine/fulcrum/trunk/resourcemanager/src/java/org/apache/fulcrum/resourcemanager/ResourceManagerService.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/resourcemanager/src/java/org/apache/fulcrum/resourcemanager/ResourceManagerService.java?rev=1173379&r1=1173378&r2=1173379&view=diff
==============================================================================
---
turbine/fulcrum/trunk/resourcemanager/src/java/org/apache/fulcrum/resourcemanager/ResourceManagerService.java
(original)
+++
turbine/fulcrum/trunk/resourcemanager/src/java/org/apache/fulcrum/resourcemanager/ResourceManagerService.java
Tue Sep 20 21:18:19 2011
@@ -42,7 +42,7 @@ public interface ResourceManagerService
String[] listDomains();
/**
- * List all avaible resources recursivelyfor a given domain.
+ * List all available resources recursively for a given domain.
*
* @param domain the domain you are interested in
* @return list of all available resources for the domain
@@ -67,11 +67,12 @@ public interface ResourceManagerService
boolean exists( String domain, String resourcePath );
/**
- * Saves a file.
+ * Saves a resource.
*
* @param domain the domain you are interested in
* @param resourcePath the path of the resource
* @param resourceContent the content of the resource
+ * @throws IOException unable to create the resource
*/
void create( String domain, String resourcePath, Object resourceContent )
throws IOException;
@@ -81,6 +82,8 @@ public interface ResourceManagerService
*
* @param domain the domain you are interested in
* @param resourcePath the path of the resource
+ * @return the loaded resource
+ * @throws IOException unable to save the resource
*/
byte[] read( String domain, String resourcePath )
throws IOException;
@@ -91,6 +94,7 @@ public interface ResourceManagerService
* @param domain the domain you are interested in
* @param resourcePath the path of the resource
* @param resourceContent the content of the resource
+ * @throws IOException unable to update the resource
*/
void update( String domain, String resourcePath, Object resourceContent )
throws IOException;
@@ -100,6 +104,8 @@ public interface ResourceManagerService
*
* @param domain the domain you are interested in
* @param resourcePath the path of the resource
+ * @return true if the resource was deleted
+ * @throws IOException unable to delete the resource
*/
boolean delete( String domain, String resourcePath )
throws IOException;
@@ -134,6 +140,8 @@ public interface ResourceManagerService
* @param domain the domain you are interested in
* @param context the context to locate the resource
* @param resourceName the name of the resource
+ * @return the loaded resource
+ * @throws IOException unable to load the resource
*/
byte[] read( String domain, String[] context, String resourceName )
throws IOException;
@@ -144,7 +152,7 @@ public interface ResourceManagerService
* @param domain the domain you are interested in
* @param context the context to locate the resource
* @param resourceName the name of the resource
- * @return the file name or null
+ * @return the resource URL or null
*/
URL getResourceURL( String domain, String[] context, String resourceName );
}
Modified:
turbine/fulcrum/trunk/resourcemanager/src/java/org/apache/fulcrum/resourcemanager/impl/BaseResourceManager.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/resourcemanager/src/java/org/apache/fulcrum/resourcemanager/impl/BaseResourceManager.java?rev=1173379&r1=1173378&r2=1173379&view=diff
==============================================================================
---
turbine/fulcrum/trunk/resourcemanager/src/java/org/apache/fulcrum/resourcemanager/impl/BaseResourceManager.java
(original)
+++
turbine/fulcrum/trunk/resourcemanager/src/java/org/apache/fulcrum/resourcemanager/impl/BaseResourceManager.java
Tue Sep 20 21:18:19 2011
@@ -66,7 +66,7 @@ public abstract class BaseResourceManage
/** The service manager supplied by the avalon framework */
private ServiceManager serviceManager;
- /** The configuraton supplied by the avalon framework */
+ /** The configuration supplied by the avalon framework */
private Configuration configuration;
/** the Avalon application directory */
@@ -208,7 +208,7 @@ public abstract class BaseResourceManage
}
/**
- * Get the content as byte[]
+ * Get the content as byte[].
*/
protected byte[] getContent( Object content )
throws IOException
@@ -458,10 +458,10 @@ public abstract class BaseResourceManage
}
/**
- * Write the given file without encryption.
- * @param target the target file
+ * Write the given content without encryption.
+ *
+ * @param os the output stream
* @parwm content the content to be written
- * @return
*/
private void writePlain( OutputStream os, byte[] content )
throws IOException
@@ -471,10 +471,10 @@ public abstract class BaseResourceManage
}
/**
- * Write the given file and encrypt it.
- * @param target the target file
+ * Write the given content and encrypt it.
+ *
+ * @param os the output stream
* @parwm content the content to be written
- * @return
*/
private void writeEncrypted( OutputStream os, byte[] content )
throws IOException
Modified:
turbine/fulcrum/trunk/resourcemanager/src/java/org/apache/fulcrum/resourcemanager/impl/FileResourceManager.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/resourcemanager/src/java/org/apache/fulcrum/resourcemanager/impl/FileResourceManager.java?rev=1173379&r1=1173378&r2=1173379&view=diff
==============================================================================
---
turbine/fulcrum/trunk/resourcemanager/src/java/org/apache/fulcrum/resourcemanager/impl/FileResourceManager.java
(original)
+++
turbine/fulcrum/trunk/resourcemanager/src/java/org/apache/fulcrum/resourcemanager/impl/FileResourceManager.java
Tue Sep 20 21:18:19 2011
@@ -160,15 +160,7 @@ public class FileResourceManager
public synchronized boolean exists(String resourceName)
{
File resourceFile = this.findResourceFile( resourceName,
this.resourceFileNameList );
-
- if( resourceFile == null )
- {
- return false;
- }
- else
- {
- return true;
- }
+ return resourceFile != null;
}
/**
@@ -217,7 +209,7 @@ public class FileResourceManager
public synchronized byte[] read( String resourcePath )
throws IOException
{
- byte[] result = null;
+ byte[] result;
File resourceFile = this.findResourceFile( resourcePath,
this.resourceFileNameList );
@@ -258,7 +250,7 @@ public class FileResourceManager
// if a resource was deleted we have to update our resource list
// to avoid a stale entry
- if( file.delete() == true )
+ if(file.delete())
{
this.createResourceFileNameList();
result = true;
@@ -272,7 +264,7 @@ public class FileResourceManager
*/
public synchronized boolean exists( String[] context, String resourceName )
{
- return( this.locate(context,resourceName) != null ? true : false );
+ return(this.locate(context, resourceName) != null);
}
/**
@@ -322,7 +314,7 @@ public class FileResourceManager
{
try
{
- return resourceFile.toURL();
+ return resourceFile.toURI().toURL();
}
catch( MalformedURLException e )
{
@@ -397,12 +389,12 @@ public class FileResourceManager
private File findResourceFile( String resourceName, String[] resourceList )
{
File result = null;
- String tempFileName = null;
+ String tempFileName;
String resourceFileName = new File( this.getResourceDir(),
resourceName).getAbsolutePath();
- boolean wasFound = ( Arrays.binarySearch( resourceList,
resourceFileName ) >= 0 ? true : false );
+ boolean wasFound = (Arrays.binarySearch(resourceList,
resourceFileName) >= 0);
- if( wasFound == true )
+ if(wasFound)
{
result = new File( resourceFileName );
}
@@ -415,10 +407,7 @@ public class FileResourceManager
String[] context = new String[parts.length-1];
String scriptBaseName = parts[parts.length-1];
- for( int i=0; i<context.length; i++ )
- {
- context[i] = parts[i];
- }
+ System.arraycopy(parts, 0, context, 0, context.length);
// create a list of files stepping up the directories
// [0]=./foo/bar/empty.groovy
@@ -474,9 +463,10 @@ public class FileResourceManager
/**
* Find all resources recursively.
+ *
* @param startDir the start directory of the search
* @param suffix an optional suffix to filter the result
- * @param result list of all Grovvy scripts
+ * @param result list of all matching resources
*/
private void findAllResources( File startDir, String suffix, ArrayList
result )
{
@@ -499,7 +489,7 @@ public class FileResourceManager
}
else
{
- if( suffix.equals("*") == false )
+ if(!suffix.equals("*"))
{
if( list[i].getName().endsWith(suffix) )
{
@@ -516,7 +506,7 @@ public class FileResourceManager
}
/**
- * Build a file name using the context and resoure name.
+ * Build a file name using the context and resource name.
* @param context the context to locate the resource
* @param resourceName the name of the resource
* @return a file name
Modified:
turbine/fulcrum/trunk/resourcemanager/src/java/org/apache/fulcrum/resourcemanager/impl/ResourceManagerServiceImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/resourcemanager/src/java/org/apache/fulcrum/resourcemanager/impl/ResourceManagerServiceImpl.java?rev=1173379&r1=1173378&r2=1173379&view=diff
==============================================================================
---
turbine/fulcrum/trunk/resourcemanager/src/java/org/apache/fulcrum/resourcemanager/impl/ResourceManagerServiceImpl.java
(original)
+++
turbine/fulcrum/trunk/resourcemanager/src/java/org/apache/fulcrum/resourcemanager/impl/ResourceManagerServiceImpl.java
Tue Sep 20 21:18:19 2011
@@ -103,7 +103,7 @@ public class ResourceManagerServiceImpl
*/
public void initialize() throws Exception
{
- ResourceManager resourceManager = null;
+ ResourceManager resourceManager;
for( int i=0; i<this.domainConfigurationList.length; i++ )
{
@@ -117,12 +117,12 @@ public class ResourceManagerServiceImpl
*/
public void dispose()
{
+ ResourceManager resourceManager;
String[] domainList = this.listDomains();
- ResourceManager resourceManager = null;
for( int i=0; i<domainList.length; i++ )
{
- resourceManager = (ResourceManager)
this.getResourceManager(domainList[i]);
+ resourceManager = this.getResourceManager(domainList[i]);
if( resourceManager instanceof Disposable )
{
@@ -192,7 +192,7 @@ public class ResourceManagerServiceImpl
*/
public String[] listDomains()
{
- String key = null;
+ String key;
Enumeration keys = this.getDomainList().keys();
ArrayList result = new ArrayList();
@@ -275,12 +275,16 @@ public class ResourceManagerServiceImpl
}
/**
- * Incarnates the concrete resource manager instances
+ * Incarnates the concrete resource manager instances.
+ *
+ * @param domainConfiguration the domain configuration
+ * @return the resource manager
+ * @throws Exception incarnating the resource manager failed
*/
private ResourceManager incarnate( Configuration domainConfiguration )
throws Exception
{
- ResourceManager result = null;
+ ResourceManager result;
String domainName = domainConfiguration.getAttribute("name");
String domainType =
domainConfiguration.getAttribute("type",FileResourceManager.class.getName());
@@ -326,13 +330,14 @@ public class ResourceManagerServiceImpl
/**
* Load the given class dynamically and return an instance of it.
* @param clazz the name of the class
+ * @param domain the name of the domain
* @return an instance of the class
* @throws Exception creating an instance failed
*/
private ResourceManager createResourceManager( String clazz, String domain
)
throws Exception
{
- ResourceManager result = null;
+ ResourceManager result;
try
{
Modified:
turbine/fulcrum/trunk/resourcemanager/src/test/org/apache/fulcrum/resourcemanager/ResourceManagerServiceTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/resourcemanager/src/test/org/apache/fulcrum/resourcemanager/ResourceManagerServiceTest.java?rev=1173379&r1=1173378&r2=1173379&view=diff
==============================================================================
---
turbine/fulcrum/trunk/resourcemanager/src/test/org/apache/fulcrum/resourcemanager/ResourceManagerServiceTest.java
(original)
+++
turbine/fulcrum/trunk/resourcemanager/src/test/org/apache/fulcrum/resourcemanager/ResourceManagerServiceTest.java
Tue Sep 20 21:18:19 2011
@@ -242,7 +242,7 @@ public class ResourceManagerServiceTest
resourceName = "inputstream.txt";
resourceContent = "Hello World";
- FileInputStream fis = new FileInputStream( "project.xml" );
+ FileInputStream fis = new FileInputStream( "pom.xml" );
this.service.create( resourceDomain, resourceName, fis );
fis.close();
assertTrue( this.service.read(resourceDomain,resourceName).length > 0
);
Modified: turbine/fulcrum/trunk/resourcemanager/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/resourcemanager/xdocs/changes.xml?rev=1173379&r1=1173378&r2=1173379&view=diff
==============================================================================
--- turbine/fulcrum/trunk/resourcemanager/xdocs/changes.xml (original)
+++ turbine/fulcrum/trunk/resourcemanager/xdocs/changes.xml Tue Sep 20 21:18:19
2011
@@ -24,7 +24,10 @@
</properties>
<body>
- <release version="1.0.1" date="2010-07-30">
+ <release version="1.0.1" date="2011-09-20">
+ <action dev="sgoeschl" type="update">
+ Cleaned up the code.
+ </action>
<action dev="sgoeschl" type="update">
Adding a M2 build
</action>
