Changeset 3553 for TI05-delivery/ows_framework

Timestamp:

03/03/08 17:16:14 (12 years ago)

Author:

spascoe

Message:

Moved all the model classes into their own sub-module.

Location:

TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common

Files:

• bbox_util.py (added)
• builder.py (modified) (1 diff)
• exceptions.py (modified) (1 diff)
• helpers.py (modified) (1 diff)
• model/README (moved) (moved from TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/README)
• model/__init__.py (added)
• model/capabilities.py (moved) (moved from TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/capabilities.py) (1 diff)
• model/common.py (moved) (moved from TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/common.py) (1 diff)
• model/contents.py (moved) (moved from TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/contents.py) (1 diff)
• model/data_identification.py (moved) (moved from TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/data_identification.py) (1 diff)
• model/domain.py (moved) (moved from TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/domain.py) (1 diff)
• model/exception_report.py (moved) (moved from TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/exception_report.py)
• model/iso19115_subset.py (moved) (moved from TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/iso19115_subset.py)
• model/operations_metadata.py (moved) (moved from TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/operations_metadata.py) (1 diff)
• model/service_identification.py (moved) (moved from TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/service_identification.py) (1 diff)
• model/service_provider.py (moved) (moved from TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/service_provider.py) (1 diff)
• model/wcs.py (moved) (moved from TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/wcs.py)
• model/wms.py (moved) (moved from TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/wms.py) (1 diff)
• pylons/ows_controller.py (modified) (1 diff)
• pylons/wms_controller.py (modified) (1 diff)
• xml/__init__.py (modified) (1 diff)
• xml/iso19115_subset.py (modified) (1 diff)
• xml/service_identification.py (modified) (1 diff)
• xml/service_provider.py (modified) (1 diff)

TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/builder.py

@@ -11 +11 @@
 from cStringIO import StringIO
 
-from ows_common.capabilities import *
-from ows_common.service_identification import *
-from ows_common.service_provider import *
-from ows_common.iso19115_subset import *
+from ows_common.model import *
 
 class ServiceMetadataBuilder(object):

TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/exceptions.py

@@ -9 +9 @@
 """
 
-from ows_common.exception_report import OwsError
+from ows_common.model.exception_report import OwsError
 
 class OperationNotSupported(OwsError):

TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/helpers.py

@@ -9 +9 @@
 """
 
-from ows_common.domain import Domain, PossibleValues
-from ows_common.operations_metadata import *
-from ows_common.wms import WmsDatasetSummary, Dimension
-from ows_common.common import BoundingBox
+from ows_common.model import *
 
 def domain(value=None, possibleValues=None, **kwargs):

TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/model/capabilities.py

@@ -8 +8 @@
 @author: Stephen Pascoe
 """
-
-from ows_common.service_identification import ServiceIdentification
-from ows_common.service_provider import ServiceProvider
-from ows_common.operations_metadata import OperationsMetadata
-from ows_common.contents import Contents
 
 class ServiceMetadata(object):

TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/model/common.py

@@ -7 +7 @@
 
 @author: Stephen Pascoe
+
 """
-
-from ows_common.iso19115_subset import Keywords, LanguageString, Code
 
 class Metadata(object):

TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/model/contents.py

@@ -9 +9 @@
 """
 
-from ows_common.data_identification import Description
-from ows_common.iso19115_subset import Code, Keywords
-from ows_common.common import Metadata, BoundingBox, WGS84BoundingBox
+from ows_common.model.iso19115_subset import Keywords
+from ows_common.model.data_identification import Description
 
 class Contents(object):

TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/model/data_identification.py

@@ -9 +9 @@
 """
 
-from ows_common.iso19115_subset import LanguageString, Keywords
-from ows_common.common import Metadata, BoundingBox
+from ows_common.model.iso19115_subset import Keywords
 
 class Description(object):

TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/model/domain.py

@@ -8 +8 @@
 @author: Stephen Pascoe
 """
-
-from ows_common.common import Metadata
 
 class Domain(object):

TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/model/operations_metadata.py

@@ -17 +17 @@
 """
 
-from ows_common.domain import Domain
-from ows_common.iso19115_subset import OnlineResource
+from ows_common.model.iso19115_subset import OnlineResource
 
 class OperationsMetadata(object):

TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/model/service_identification.py

@@ -9 +9 @@
 """
 
-from ows_common.data_identification import Description
-from ows_common.iso19115_subset import Code
+from ows_common.model.data_identification import Description
 
 class ServiceIdentification(Description):

TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/model/service_provider.py

@@ -7 +7 @@
 
 @author: Dominic Lowe
+
 """
-from ows_common.iso19115_subset import ResponsibleParty
-from ows_common.iso19115_subset import OnlineResource
 
 class ServiceProvider(object):

TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/model/wms.py

@@ -9 +9 @@
 """
 
-from ows_common.contents import Contents, DatasetSummary
-from ows_common.domain import Domain
+from ows_common.model.contents import DatasetSummary
+from ows_common.model.domain import Domain
 
 class WmsDatasetSummary(DatasetSummary):

TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/pylons/ows_controller.py

@@ -17 +17 @@
 from ows_common.builder import loadConfigFile
 from ows_common import helpers
-from ows_common.operations_metadata import *
-from ows_common.contents import Contents
+
+from ows_common.model import *
 
 from genshi.template import TemplateLoader

TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/pylons/wms_controller.py

@@ -15 +15 @@
 import Image
 
-from ows_common.wms import WmsDatasetSummary, Dimension
-from ows_common.domain import PossibleValues
-from ows_common.common import BoundingBox
+from ows_common.model.wms import WmsDatasetSummary, Dimension
+from ows_common.model import PossibleValues, BoundingBox, Contents
 from ows_common.pylons import ows_controller, model
 from ows_common.exceptions import *
 from ows_common import bbox_util
-from ows_common.contents import Contents
 
 class WMSController(ows_controller.OWSController):

TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/xml/__init__.py

@@ -15 +15 @@
 from ows_common.xml.service_identification import *
 from ows_common.xml.service_provider import *
-from ows_common.capabilities import ServiceMetadata
 from ows_common.xml import ns
 from ows_common.xml.util import *
+from ows_common.model import ServiceMetadata
 
 def service_metadata(node):

TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/xml/iso19115_subset.py

@@ -15 +15 @@
 from ows_common.xml import ns
 from ows_common.xml.util import *
-from ows_common.iso19115_subset import *
+from ows_common.model.iso19115_subset import *
 
 

TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/xml/service_identification.py

@@ -15 +15 @@
 from ows_common.xml import ns
 from ows_common.xml.util import *
-from ows_common.service_identification import *
+from ows_common.model.service_identification import *
 from ows_common.xml.iso19115_subset import *
 

TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/xml/service_provider.py

@@ -16 +16 @@
 from ows_common.xml.util import *
 from ows_common.xml.iso19115_subset import *
-from ows_common.service_provider import *
+from ows_common.model.service_provider import *
 
 def service_provider(node):