You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2012/04/11 16:13:15 UTC
svn commit: r1324774 - in /karaf/trunk/region/persist: ./
src/main/java/org/apache/karaf/region/persist/internal/
src/main/java/org/apache/karaf/region/persist/internal/model/
src/main/java/org/apache/karaf/region/persist/model/
Author: cschneider
Date: Wed Apr 11 14:13:14 2012
New Revision: 1324774
URL: http://svn.apache.org/viewvc?rev=1324774&view=rev
Log:
Making region/persist/model private as it is only used internally
Added:
karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/
- copied from r1324616, karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/
Removed:
karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/
Modified:
karaf/trunk/region/persist/pom.xml
karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/RegionsPersistenceImpl.java
karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/FilterAttributeType.java
karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/FilterBundleType.java
karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/FilterNamespaceType.java
karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/FilterPackageType.java
karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/FilterType.java
karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/ObjectFactory.java
karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/RegionBundleType.java
karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/RegionType.java
karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/RegionsType.java
karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/package-info.java
Modified: karaf/trunk/region/persist/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/region/persist/pom.xml?rev=1324774&r1=1324773&r2=1324774&view=diff
==============================================================================
--- karaf/trunk/region/persist/pom.xml (original)
+++ karaf/trunk/region/persist/pom.xml Wed Apr 11 14:13:14 2012
@@ -108,12 +108,6 @@
<configuration>
<instructions>
<Bundle-Activator>org.apache.karaf.region.persist.internal.Activator</Bundle-Activator>
- <Import-Package>
- !${project.artifactId}*,
- !org.apache.karaf.region;version="${project.version}",
- *
- </Import-Package>
- <Private-Package>org.apache.karaf.region.internal,org.apache.karaf.region.model</Private-Package>
</instructions>
</configuration>
</plugin>
@@ -137,7 +131,7 @@
</executions>
<configuration>
<schemaDirectory>src/main/resources/org/apache/karaf/region/persist</schemaDirectory>
- <packageName>org.apache.karaf.region.persist.model</packageName>
+ <packageName>org.apache.karaf.region.persist.internal.model</packageName>
<extension>true</extension>
</configuration>
</plugin>
Modified: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/RegionsPersistenceImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/RegionsPersistenceImpl.java?rev=1324774&r1=1324773&r2=1324774&view=diff
==============================================================================
--- karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/RegionsPersistenceImpl.java (original)
+++ karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/RegionsPersistenceImpl.java Wed Apr 11 14:13:14 2012
@@ -34,15 +34,15 @@ import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import org.apache.karaf.region.persist.RegionsPersistence;
+import org.apache.karaf.region.persist.internal.model.FilterAttributeType;
+import org.apache.karaf.region.persist.internal.model.FilterBundleType;
+import org.apache.karaf.region.persist.internal.model.FilterNamespaceType;
+import org.apache.karaf.region.persist.internal.model.FilterPackageType;
+import org.apache.karaf.region.persist.internal.model.FilterType;
+import org.apache.karaf.region.persist.internal.model.RegionBundleType;
+import org.apache.karaf.region.persist.internal.model.RegionType;
+import org.apache.karaf.region.persist.internal.model.RegionsType;
import org.apache.karaf.region.persist.internal.util.ManifestHeaderProcessor;
-import org.apache.karaf.region.persist.model.FilterAttributeType;
-import org.apache.karaf.region.persist.model.FilterBundleType;
-import org.apache.karaf.region.persist.model.FilterNamespaceType;
-import org.apache.karaf.region.persist.model.FilterPackageType;
-import org.apache.karaf.region.persist.model.FilterType;
-import org.apache.karaf.region.persist.model.RegionBundleType;
-import org.apache.karaf.region.persist.model.RegionType;
-import org.apache.karaf.region.persist.model.RegionsType;
import org.eclipse.equinox.region.Region;
import org.eclipse.equinox.region.RegionDigraph;
import org.eclipse.equinox.region.RegionFilterBuilder;
@@ -56,7 +56,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public class RegionsPersistenceImpl implements RegionsPersistence {
Modified: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/FilterAttributeType.java
URL: http://svn.apache.org/viewvc/karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/FilterAttributeType.java?rev=1324774&r1=1324616&r2=1324774&view=diff
==============================================================================
--- karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/FilterAttributeType.java (original)
+++ karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/FilterAttributeType.java Wed Apr 11 14:13:14 2012
@@ -6,7 +6,7 @@
//
-package org.apache.karaf.region.persist.model;
+package org.apache.karaf.region.persist.internal.model;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/FilterBundleType.java
URL: http://svn.apache.org/viewvc/karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/FilterBundleType.java?rev=1324774&r1=1324616&r2=1324774&view=diff
==============================================================================
--- karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/FilterBundleType.java (original)
+++ karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/FilterBundleType.java Wed Apr 11 14:13:14 2012
@@ -6,7 +6,7 @@
//
-package org.apache.karaf.region.persist.model;
+package org.apache.karaf.region.persist.internal.model;
import java.util.ArrayList;
import java.util.List;
Modified: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/FilterNamespaceType.java
URL: http://svn.apache.org/viewvc/karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/FilterNamespaceType.java?rev=1324774&r1=1324616&r2=1324774&view=diff
==============================================================================
--- karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/FilterNamespaceType.java (original)
+++ karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/FilterNamespaceType.java Wed Apr 11 14:13:14 2012
@@ -6,7 +6,7 @@
//
-package org.apache.karaf.region.persist.model;
+package org.apache.karaf.region.persist.internal.model;
import java.util.ArrayList;
import java.util.List;
Modified: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/FilterPackageType.java
URL: http://svn.apache.org/viewvc/karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/FilterPackageType.java?rev=1324774&r1=1324616&r2=1324774&view=diff
==============================================================================
--- karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/FilterPackageType.java (original)
+++ karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/FilterPackageType.java Wed Apr 11 14:13:14 2012
@@ -6,7 +6,7 @@
//
-package org.apache.karaf.region.persist.model;
+package org.apache.karaf.region.persist.internal.model;
import java.util.ArrayList;
import java.util.List;
Modified: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/FilterType.java
URL: http://svn.apache.org/viewvc/karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/FilterType.java?rev=1324774&r1=1324616&r2=1324774&view=diff
==============================================================================
--- karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/FilterType.java (original)
+++ karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/FilterType.java Wed Apr 11 14:13:14 2012
@@ -6,7 +6,7 @@
//
-package org.apache.karaf.region.persist.model;
+package org.apache.karaf.region.persist.internal.model;
import java.util.ArrayList;
import java.util.List;
Modified: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/ObjectFactory.java
URL: http://svn.apache.org/viewvc/karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/ObjectFactory.java?rev=1324774&r1=1324616&r2=1324774&view=diff
==============================================================================
--- karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/ObjectFactory.java (original)
+++ karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/ObjectFactory.java Wed Apr 11 14:13:14 2012
@@ -6,7 +6,7 @@
//
-package org.apache.karaf.region.persist.model;
+package org.apache.karaf.region.persist.internal.model;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlElementDecl;
@@ -17,7 +17,7 @@ import javax.xml.namespace.QName;
/**
* This object contains factory methods for each
* Java content interface and Java element interface
- * generated in the org.apache.karaf.region.persist.model package.
+ * generated in the org.apache.karaf.region.persist.internal.model package.
* <p>An ObjectFactory allows you to programatically
* construct new instances of the Java representation
* for XML content. The Java representation of XML
@@ -34,7 +34,7 @@ public class ObjectFactory {
private final static QName _Regions_QNAME = new QName("http://karaf.apache.org/xmlns/region/v1.0.0", "regions");
/**
- * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.karaf.region.persist.model
+ * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.karaf.region.persist.internal.model
*
*/
public ObjectFactory() {
Modified: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/RegionBundleType.java
URL: http://svn.apache.org/viewvc/karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/RegionBundleType.java?rev=1324774&r1=1324616&r2=1324774&view=diff
==============================================================================
--- karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/RegionBundleType.java (original)
+++ karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/RegionBundleType.java Wed Apr 11 14:13:14 2012
@@ -6,7 +6,7 @@
//
-package org.apache.karaf.region.persist.model;
+package org.apache.karaf.region.persist.internal.model;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/RegionType.java
URL: http://svn.apache.org/viewvc/karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/RegionType.java?rev=1324774&r1=1324616&r2=1324774&view=diff
==============================================================================
--- karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/RegionType.java (original)
+++ karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/RegionType.java Wed Apr 11 14:13:14 2012
@@ -6,7 +6,7 @@
//
-package org.apache.karaf.region.persist.model;
+package org.apache.karaf.region.persist.internal.model;
import java.util.ArrayList;
import java.util.List;
Modified: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/RegionsType.java
URL: http://svn.apache.org/viewvc/karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/RegionsType.java?rev=1324774&r1=1324616&r2=1324774&view=diff
==============================================================================
--- karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/RegionsType.java (original)
+++ karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/RegionsType.java Wed Apr 11 14:13:14 2012
@@ -6,7 +6,7 @@
//
-package org.apache.karaf.region.persist.model;
+package org.apache.karaf.region.persist.internal.model;
import java.util.ArrayList;
import java.util.List;
Modified: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/package-info.java
URL: http://svn.apache.org/viewvc/karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/package-info.java?rev=1324774&r1=1324616&r2=1324774&view=diff
==============================================================================
--- karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/package-info.java (original)
+++ karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/model/package-info.java Wed Apr 11 14:13:14 2012
@@ -6,4 +6,4 @@
//
@javax.xml.bind.annotation.XmlSchema(namespace = "http://karaf.apache.org/xmlns/region/v1.0.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.apache.karaf.region.persist.model;
+package org.apache.karaf.region.persist.internal.model;