5 files changed, 23 insertions, 208 deletions
diff --git a/examples/OpenGIS/check_sos.py b/examples/OpenGIS/check_sos.py
index c3b5642..d99c870 100644
--- a/examples/OpenGIS/check_sos.py
+++ b/examples/OpenGIS/check_sos.py
@@ -1,12 +1,12 @@
-import opengis.sos_1_0 as sos
+import pyxb.bundles.opengis.sos_1_0 as sos
 import pyxb.utils.utility
 import sys
 import traceback
 
 # Import to define bindings for namespaces that appear in instance documents
-import opengis.sampling_1_0 as sampling
-import opengis.swe_1_0_1 as swe
-import opengis.tml
+import pyxb.bundles.opengis.sampling_1_0 as sampling
+import pyxb.bundles.opengis.swe_1_0_1 as swe
+import pyxb.bundles.opengis.tml
 
 for f in sys.argv[1:]:
     print '------------------ %s' % (f,)
diff --git a/examples/OpenGIS/demo.py b/examples/OpenGIS/demo.py
index 170ebf1..4693317 100644
--- a/examples/OpenGIS/demo.py
+++ b/examples/OpenGIS/demo.py
@@ -1,3 +1,3 @@
-import opengis.gml
-dv = opengis.gml.DegreesType(32, direction='N')
+import pyxb.bundles.opengis.gml as gml
+dv = gml.DegreesType(32, direction='N')
 print dv.toxml()
diff --git a/examples/OpenGIS/makebind.sh b/examples/OpenGIS/makebind.sh
deleted file mode 100644
index 800613d..0000000
--- a/examples/OpenGIS/makebind.sh
+++ /dev/null
@@ -1,195 +0,0 @@
-export PYXB_ARCHIVE_PATH=opengis//:+
-PYXB_ROOT=${PYXB_ROOT:-../..}
-export PYTHONPATH=${PYXB_ROOT}
-export PATH=${PYXB_ROOT}/scripts:${PATH}
-if [ ! -f SCHEMAS_OPENGIS_NET.tgz ] ; then
-  wget http://schemas.opengis.net/SCHEMAS_OPENGIS_NET.tgz
-fi
-if [ ! -d Schemas ] ; then
-  rm -rf Schemas
-  mkdir Schemas
-  echo "Unpacking schemas"
-  ( cd Schemas ; tar xzf ../SCHEMAS_OPENGIS_NET.tgz )
-fi
-
-failure () {
-  echo "Failed: ${@}"
-  exit 1
-}
-
-pyxbgen \
-  --schema-location=Schemas/citygml/xAL/xAL.xsd --module=xAL \
-  --module-prefix=opengis.misc \
-  --archive-to-file=opengis/misc/xAL.wxs \
- || failure xAL
-
-pyxbgen \
-  --schema-location=Schemas/xlink/1.0.0/xlinks.xsd --module=xlinks \
-  --module-prefix=opengis.misc \
-  --archive-to-file=opengis/misc/xlinks.wxs \
- || failure xlinks
-
-pyxbgen \
-  --schema-location=Schemas/gml/3.2.1/gml.xsd --module=gml_3_2 \
-  --schema-location=Schemas/iso/19139/20070417/gmd/gmd.xsd --module=iso19139.gmd \
-  --schema-location=Schemas/iso/19139/20070417/gts/gts.xsd --module=iso19139.gts \
-  --schema-location=Schemas/iso/19139/20070417/gsr/gsr.xsd --module=iso19139.gsr \
-  --schema-location=Schemas/iso/19139/20070417/gss/gss.xsd --module=iso19139.gss \
-  --schema-location=Schemas/iso/19139/20070417/gco/gco.xsd --module=iso19139.gco \
-  --module-prefix=opengis \
-  --archive-to-file=opengis/iso19139/core.wxs \
- || failure gml_3_2
-  
-pyxbgen \
-  --schema-location=Schemas/iso/19139/20070417/gmx/gmx.xsd --module=gmx \
-  --module-prefix=opengis.iso19139 \
-  --archive-to-file=opengis/iso19139/gmx.wxs \
- || failure gmx
-
-# Includes smil20, smil20lang
-pyxbgen \
-  --schema-location=Schemas/gml/3.1.1/base/gml.xsd --module=gml \
-  --module-prefix=opengis \
-  --archive-to-file=opengis/gml.wxs \
- || failure gml
-
-pyxbgen \
-  --schema-location=Schemas/filter/1.1.0/filter.xsd --module=filter \
-  --module-prefix=opengis \
-  --archive-to-file=opengis/filter.wxs \
- || failure filter
-
-pyxbgen \
-  --schema-location=Schemas/sweCommon/1.0.0/swe.xsd --module=swe_1_0_0 \
-  --module-prefix=opengis \
-  --archive-to-file=opengis/swe_1_0_0.wxs \
- || failure swe_1_0_0
-  
-pyxbgen \
-  --schema-location=Schemas/sweCommon/1.0.1/swe.xsd --module=swe_1_0_1 \
-  --module-prefix=opengis \
-  --archive-to-file=opengis/swe_1_0_1.wxs \
- || failure swe_1_0_1
-  
-pyxbgen \
-  --schema-location=Schemas/citygml/1.0/cityGMLBase.xsd --module=base \
-  --module-prefix=opengis.citygml \
-  --archive-to-file=opengis/citygml/base.wxs \
- || failure citygml
-  
-pyxbgen \
-  --schema-location=Schemas/kml/2.2.0/ogckml22.xsd --module=ogckml22 \
-  --module-prefix=opengis \
-  --archive-to-file=opengis/ogckml22.wxs \
- || failure ogckml22
-
-pyxbgen \
-  --schema-location=Schemas/ic/2.1/IC-ISM-v2.1.xsd --module=ic_ism_2_1 \
-  --module-prefix=opengis \
-  --archive-to-file=opengis/ic_ism_2_1.wxs \
- || failure ic_ism_2_1
-
-pyxbgen \
-  --schema-location=Schemas/sensorML/1.0.1/sensorML.xsd --module=sensorML_1_0_1 \
-  --module-prefix=opengis \
-  --archive-to-file=opengis/sensorML_1_0_1.wxs \
- || failure sensorML_1_0_1
-
-pyxbgen \
-  --schema-location=Schemas/ows/1.0.0/owsAll.xsd --module=ows \
-  --module-prefix=opengis \
-  --archive-to-file=opengis/ows.wxs \
- || failure ows
-
-pyxbgen \
-  --schema-location=Schemas/ows/1.1.0/owsAll.xsd --module=ows_1_1 \
-  --module-prefix=opengis \
-  --archive-to-file=opengis/ows_1_1.wxs \
- || failure ows_1_1
-
-pyxbgen \
-  --schema-location=Schemas/om/1.0.0/om.xsd --module=om_1_0 \
-  --module-prefix=opengis \
-  --archive-to-file=opengis/om_1_0.wxs \
- || failure om_1_0
-
-# Conflicts with filter's definition of ogc
-pyxbgen \
-  --schema-location=Schemas/sos/1.0.0/sosAll.xsd --module=sos_1_0 \
-  --module-prefix=opengis \
-  --pre-load-archive=opengis/filter.wxs \
-  --archive-to-file=opengis/sos_1_0.wxs \
- || failure sos_1_0
-
-pyxbgen \
-  --schema-location=Schemas/sampling/1.0.0/sampling.xsd --module=sampling_1_0 \
-  --module-prefix=opengis \
-  --archive-to-file=opengis/sampling_1_0.wxs \
- || failure sampling_1_0
-
-# Conflicts with sos + filter
-pyxbgen \
-  --schema-location=Schemas/tml/1.0.0/tml.xsd --module=tml \
-  --module-prefix=opengis \
-  --archive-to-file=opengis/tml.wxs \
- || failure tml
-
-pyxbgen \
-  --schema-location=Schemas/wfs/1.1.0/wfs.xsd --module=wfs \
-  --module-prefix=opengis \
-  --archive-to-file=opengis/wfs.wxs \
- || failure wfs
-
-pyxbgen \
-  --schema-location=Schemas/wcs/1.1/wcsAll.xsd --module=wcs_1_1 \
-  --module-prefix=opengis \
-  --archive-to-file=opengis/wcs_1_1.wxs \
- || failure wcs_1_1
-
-# NB: Uses a special (private) version of Dublin Core
-pyxbgen \
-  --schema-location=Schemas/csw/2.0.2/record.xsd --module=csw_2_0_2 \
-  --module-prefix=opengis \
-  --archive-to-file=opengis/csw_2_0_2.wxs \
- || failure csw_2_0_2
-
-# This supports the simplified features variants of GML, which have
-# three levels (0, 1, and 2).  Need ability to prefer a specific
-# namespace archive to make use of this.
-pyxbgen \
-  --schema-location=Schemas/gml/3.1.1/profiles/gmlsfProfile/1.0.0/gmlsfLevels.xsd --module=gmlsf \
-  --module-prefix=opengis \
-  --archive-to-file=opengis/gmlsf.wxs \
- || failure gmlsf
-
-# Can't do context: depends on gml 2.x, and we don't support version
-# identification in namespace archives yet.
-#pyxbgen \
-#  --schema-location=Schemas/context/1.1.0/context.xsd --module=context \
-#  --module-prefix=opengis \
-#  --archive-to-file=opengis/context.wxs
-
-# Get the gazetteer application profile package here:
-#   http://portal.opengeospatial.org/files/index.php?artifact_id=15529
-# This presents a license agreement you need to click OK on, so you'll
-# have to retrieve it by browser, then unpack it into a Gazetteer
-# directory here.
-
-(cd Schemas/citygml ; ls */1.0/*.xsd ) \
- | cut -d/ -f1,3 \
- | tr '/' ' ' \
- | while read module xsd ; do
-    pyxbgen \
-     --schema-location=Schemas/citygml/${module}/1.0/${xsd} --module=${module} \
-     --module-prefix=opengis.citygml \
-     --archive-to-file=opengis/citygml/${module}.wxs \
-    || failure citygml ${module}
- done
-
-if [ -f Gazetteer/iso19112.xsd ] ; then
-  pyxbgen \
-    --schema-location=Gazetteer/iso19112.xsd --module=gazetteer \
-    --module-prefix=opengis
-fi
-    
-
diff --git a/examples/OpenGIS/test.sh b/examples/OpenGIS/test.sh
index fa8963b..a68ae55 100644
--- a/examples/OpenGIS/test.sh
+++ b/examples/OpenGIS/test.sh
@@ -1,12 +1,22 @@
-export PYXB_ARCHIVE_PATH=opengis//:+
-PYXB_ROOT=../..
-export PYTHONPATH=${PYXB_ROOT}:.
+PYXB_ROOT=${PYXB_ROOT:-../..}
+export PYXB_ARCHIVE_PATH=${PYXB_ROOT}/pyxb/bundles/opengis//:+
+export PYTHONPATH=${PYXB_ROOT}
 export PATH=${PYXB_ROOT}/scripts:${PATH}
-
-if [ ! -d opengis ] ; then
-  sh makebind.sh
+if [ ! -f SCHEMAS_OPENGIS_NET.tgz ] ; then
+  wget http://schemas.opengis.net/SCHEMAS_OPENGIS_NET.tgz
+fi
+if [ ! -d Schemas ] ; then
+  rm -rf Schemas
+  mkdir Schemas
+  echo "Unpacking schemas"
+  ( cd Schemas ; tar xzf ../SCHEMAS_OPENGIS_NET.tgz )
 fi
 
+failure () {
+  echo "Failed: ${@}"
+  exit 1
+}
+
 python demo.py || exit 1
 
 # sosRegisterSensor.xml uses tml:tcfTrigger, but the element is really named tml:cfTrigger
diff --git a/examples/OpenGIS/testgml.py b/examples/OpenGIS/testgml.py
index 0d9fc0b..ad2f508 100644
--- a/examples/OpenGIS/testgml.py
+++ b/examples/OpenGIS/testgml.py
@@ -1,6 +1,6 @@
 #  PYTHONPATH=../..:. PYXB_ARCHIVE_PATH=opengis/iso19139:+ ../../scripts/pyxbgen -u gmlapp.xsd -m gmlapp
 
-import opengis.gml_3_2 as gml
+import pyxb.bundles.opengis.gml_3_2 as gml
 import gmlapp
 import pyxb.utils.domutils