You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by mn...@apache.org on 2009/12/23 15:37:32 UTC
svn commit: r893529 - in
/incubator/aries/trunk/application/application-utils: ./
src/main/java/org/apache/aries/application/filesystem/utils/
src/main/java/org/apache/aries/application/filesystem/utils/impl/
src/main/java/org/apache/aries/application/...
Author: mnuttall
Date: Wed Dec 23 14:37:31 2009
New Revision: 893529
URL: http://svn.apache.org/viewvc?rev=893529&view=rev
Log:
ARIES-89: Implement application support: refactor package names
Added:
incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/
incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/FileSystem.java
- copied, changed from r893522, incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/filesystem/utils/FileSystem.java
incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/IOUtils.java
- copied, changed from r893522, incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/filesystem/utils/IOUtils.java
incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/impl/
- copied from r893522, incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/filesystem/utils/impl/
Removed:
incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/filesystem/utils/FileSystem.java
incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/filesystem/utils/IOUtils.java
incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/filesystem/utils/impl/
Modified:
incubator/aries/trunk/application/application-utils/pom.xml
incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/impl/DirectoryImpl.java
incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/impl/FileImpl.java
incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/impl/ZipDirectory.java
incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/impl/ZipFileImpl.java
incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/manifest/BundleManifest.java
incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/manifest/ManifestDefaultsInjector.java
Modified: incubator/aries/trunk/application/application-utils/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/pom.xml?rev=893529&r1=893528&r2=893529&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-utils/pom.xml (original)
+++ incubator/aries/trunk/application/application-utils/pom.xml Wed Dec 23 14:37:31 2009
@@ -81,7 +81,8 @@
<Export-Package>
org.apache.aries.application;version="${pom.version}",
org.apache.aries.application.utils;version="${pom.version}",
- org.apache.aries.application.filesystem.utils;version="${pom.version}"
+ org.apache.aries.application.utils.filesystem;version="${pom.version}",
+ org.apache.aries.application.utils.manifest;version="${pom.version}"
</Export-Package>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
<_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
Copied: incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/FileSystem.java (from r893522, incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/filesystem/utils/FileSystem.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/FileSystem.java?p2=incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/FileSystem.java&p1=incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/filesystem/utils/FileSystem.java&r1=893522&r2=893529&rev=893529&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/filesystem/utils/FileSystem.java (original)
+++ incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/FileSystem.java Wed Dec 23 14:37:31 2009
@@ -17,15 +17,15 @@
* under the License.
*/
-package org.apache.aries.application.filesystem.utils;
+package org.apache.aries.application.utils.filesystem;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import org.apache.aries.application.filesystem.IDirectory;
-import org.apache.aries.application.filesystem.utils.impl.DirectoryImpl;
-import org.apache.aries.application.filesystem.utils.impl.ZipDirectory;
+import org.apache.aries.application.utils.filesystem.impl.DirectoryImpl;
+import org.apache.aries.application.utils.filesystem.impl.ZipDirectory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/IOUtils.java (from r893522, incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/filesystem/utils/IOUtils.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/IOUtils.java?p2=incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/IOUtils.java&p1=incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/filesystem/utils/IOUtils.java&r1=893522&r2=893529&rev=893529&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/filesystem/utils/IOUtils.java (original)
+++ incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/IOUtils.java Wed Dec 23 14:37:31 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.aries.application.filesystem.utils;
+package org.apache.aries.application.utils.filesystem;
import java.io.Closeable;
import java.io.File;
Modified: incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/impl/DirectoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/impl/DirectoryImpl.java?rev=893529&r1=893522&r2=893529&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/impl/DirectoryImpl.java (original)
+++ incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/impl/DirectoryImpl.java Wed Dec 23 14:37:31 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.aries.application.filesystem.utils.impl;
+package org.apache.aries.application.utils.filesystem.impl;
import java.io.File;
import java.io.IOException;
Modified: incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/impl/FileImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/impl/FileImpl.java?rev=893529&r1=893522&r2=893529&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/impl/FileImpl.java (original)
+++ incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/impl/FileImpl.java Wed Dec 23 14:37:31 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.aries.application.filesystem.utils.impl;
+package org.apache.aries.application.utils.filesystem.impl;
import java.io.File;
import java.io.FileInputStream;
Modified: incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/impl/ZipDirectory.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/impl/ZipDirectory.java?rev=893529&r1=893522&r2=893529&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/impl/ZipDirectory.java (original)
+++ incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/impl/ZipDirectory.java Wed Dec 23 14:37:31 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.aries.application.filesystem.utils.impl;
+package org.apache.aries.application.utils.filesystem.impl;
import java.io.File;
import java.io.InputStream;
Modified: incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/impl/ZipFileImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/impl/ZipFileImpl.java?rev=893529&r1=893522&r2=893529&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/impl/ZipFileImpl.java (original)
+++ incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/filesystem/impl/ZipFileImpl.java Wed Dec 23 14:37:31 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.aries.application.filesystem.utils.impl;
+package org.apache.aries.application.utils.filesystem.impl;
import java.io.File;
import java.io.IOException;
Modified: incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/manifest/BundleManifest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/manifest/BundleManifest.java?rev=893529&r1=893528&r2=893529&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/manifest/BundleManifest.java (original)
+++ incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/manifest/BundleManifest.java Wed Dec 23 14:37:31 2009
@@ -29,7 +29,7 @@
import java.util.zip.ZipEntry;
import org.apache.aries.application.filesystem.IFile;
-import org.apache.aries.application.filesystem.utils.IOUtils;
+import org.apache.aries.application.utils.filesystem.IOUtils;
import org.apache.aries.application.utils.internal.MessageUtil;
import org.apache.aries.application.utils.manifest.ManifestHeaderProcessor.NameValueMap;
import org.apache.aries.application.utils.manifest.ManifestHeaderProcessor.NameValuePair;
Modified: incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/manifest/ManifestDefaultsInjector.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/manifest/ManifestDefaultsInjector.java?rev=893529&r1=893528&r2=893529&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/manifest/ManifestDefaultsInjector.java (original)
+++ incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/manifest/ManifestDefaultsInjector.java Wed Dec 23 14:37:31 2009
@@ -6,8 +6,8 @@
import org.apache.aries.application.filesystem.IDirectory;
import org.apache.aries.application.filesystem.IFile;
-import org.apache.aries.application.filesystem.utils.FileSystem;
import org.apache.aries.application.utils.AppConstants;
+import org.apache.aries.application.utils.filesystem.FileSystem;
import org.osgi.framework.Version;
public class ManifestDefaultsInjector