sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1418221 - in /sis/branches/JDK7: sis-metadata/src/main/java/org/apache/sis/internal/ sis-metadata/src/main/java/org/apache/sis/internal/jaxb/ sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/ sis-utility/src/main/java/org/apach...
Date Fri, 07 Dec 2012 08:50:33 GMT
Author: desruisseaux
Date: Fri Dec  7 08:50:30 2012
New Revision: 1418221

URL: http://svn.apache.org/viewvc?rev=1418221&view=rev
Log:
Moved CodeListAdapter and CodeListProxy from "code" to "gmd" package,
in order to keep the "code" package available for sis-metadata module.
This separation is required in OSGi environments.

Added:
    sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/
    sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/
    sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/
    sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/package-info.java
      - copied, changed from r1417785, sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/code/package-info.java
    sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java
      - copied, changed from r1417785, sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/code/CodeListAdapter.java
    sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListProxy.java
      - copied, changed from r1417785, sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/code/CodeListProxy.java
Removed:
    sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/code/
Modified:
    sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java
    sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java
    sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/package-info.java

Copied: sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/package-info.java
(from r1417785, sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/code/package-info.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/package-info.java?p2=sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/package-info.java&p1=sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/code/package-info.java&r1=1417785&r2=1418221&rev=1418221&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/code/package-info.java
(original)
+++ sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/package-info.java
Fri Dec  7 08:50:30 2012
@@ -17,7 +17,7 @@
 
 /**
  * JAXB adapters for code {@linkplain org.opengis.util.CodeList code lists}.
- * Every time JAXB will try to marshall or unmarshall a code list, an adapter will replace
the
+ * Every time JAXB will try to marshal or unmarshal a code list, an adapter will replace
the
  * code list value (which would otherwise be written directly by JAXB) by an element like
below:
  *
  * <ul>

Copied: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java
(from r1417785, sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/code/CodeListAdapter.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java?p2=sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java&p1=sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/code/CodeListAdapter.java&r1=1417785&r2=1418221&rev=1418221&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/code/CodeListAdapter.java
(original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java
Fri Dec  7 08:50:30 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.jaxb.code;
+package org.apache.sis.internal.jaxb.gmd;
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 import org.opengis.util.CodeList;

Copied: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListProxy.java
(from r1417785, sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/code/CodeListProxy.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListProxy.java?p2=sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListProxy.java&p1=sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/code/CodeListProxy.java&r1=1417785&r2=1418221&rev=1418221&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/code/CodeListProxy.java
(original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListProxy.java
Fri Dec  7 08:50:30 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.jaxb.code;
+package org.apache.sis.internal.jaxb.gmd;
 
 import java.util.Locale;
 import java.util.ResourceBundle;
@@ -128,7 +128,7 @@ public final class CodeListProxy {
      *
      * @see <a href="http://jira.codehaus.org/browse/GEO-199">GEO-199</a>
      */
-    public CodeListProxy(final String value) {
+    CodeListProxy(final String value) {
         this.value = value;
     }
 
@@ -142,7 +142,7 @@ public final class CodeListProxy {
      * @param codeSpace     The 3-letters language code of the {@code value} attribute, or
{@code null} if none.
      * @param value         The value in the language specified by the {@code codeSpace}
attribute, or {@code null} if none.
      */
-    public CodeListProxy(final MarshalContext context, final String catalog,
+    CodeListProxy(final MarshalContext context, final String catalog,
             final String codeList, final String codeListValue, final String codeSpace, final
String value)
     {
         this.codeList      = schema(context, catalog, codeList);
@@ -152,13 +152,13 @@ public final class CodeListProxy {
     }
 
     /**
-     * Builds a proxy instance of {@link CodeList}. This constructors stores
-     * the values that will be used for marshalling.
+     * Builds a proxy instance of {@link CodeList}.
+     * This constructors stores the values that will be used for marshalling.
      *
      * @param context The current (un)marshalling context, or {@code null} if none.
      * @param code    The code list to wrap.
      */
-    public CodeListProxy(final MarshalContext context, final CodeList<?> code) {
+    CodeListProxy(final MarshalContext context, final CodeList<?> code) {
         final String classID = CodeLists.getListName(code);
         final String fieldID = CodeLists.getCodeName(code);
         codeList = schema(context, "gmxCodelists.xml", classID);

Modified: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java?rev=1418221&r1=1418220&r2=1418221&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java
(original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java
Fri Dec  7 08:50:30 2012
@@ -23,7 +23,6 @@ import javax.xml.bind.annotation.XmlElem
 import org.apache.sis.util.Locales;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.internal.jaxb.MarshalContext;
-import org.apache.sis.internal.jaxb.code.CodeListProxy;
 import org.apache.sis.internal.jaxb.gco.GO_CharacterString;
 import org.apache.sis.internal.jaxb.gco.CharSequenceAdapter;
 

Modified: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java?rev=1418221&r1=1418220&r2=1418221&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java
(original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java
Fri Dec  7 08:50:30 2012
@@ -21,7 +21,6 @@ import javax.xml.bind.annotation.XmlType
 import javax.xml.bind.annotation.XmlElement;
 
 import org.apache.sis.internal.jaxb.MarshalContext;
-import org.apache.sis.internal.jaxb.code.CodeListProxy;
 import org.apache.sis.internal.jaxb.gco.GO_CharacterString;
 import org.apache.sis.internal.jaxb.gco.CharSequenceAdapter;
 

Modified: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/package-info.java?rev=1418221&r1=1418220&r2=1418221&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/package-info.java
(original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/package-info.java
Fri Dec  7 08:50:30 2012
@@ -18,7 +18,7 @@
 /**
  * Miscellaneous objects and adapters defined in the {@code "gmd"} namespace.
  * This package does not include the adapters for ISO 19115 classes and code
- * lists, which are defined in their own package.
+ * lists (except base classes), which are defined in their own package.
  *
  * @author  Cédric Briançon (Geomatys)
  * @since   0.3 (derived from geotk-2.5)
@@ -28,7 +28,9 @@
  * @see javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter
  */
 @XmlSchema(elementFormDefault = XmlNsForm.QUALIFIED, namespace = Namespaces.GMD, xmlns =
{
-    @XmlNs(prefix = "gmd", namespaceURI = Namespaces.GMD)
+    @XmlNs(prefix = "gmi", namespaceURI = Namespaces.GMI),
+    @XmlNs(prefix = "gmd", namespaceURI = Namespaces.GMD),
+    @XmlNs(prefix = "gco", namespaceURI = Namespaces.GCO)
 })
 @XmlAccessorType(XmlAccessType.NONE)
 package org.apache.sis.internal.jaxb.gmd;



Mime
View raw message