Changeset 8123
- Timestamp:
- 01/03/12 21:57:22 (9 years ago)
- Location:
- mauRepo/revitalizationProject/branches/MEDIN
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
mauRepo/revitalizationProject/branches/MEDIN/dataProviderSchema/src/main/resources/DPWS.xsd
r8070 r8123 775 775 type="dpw:CSWProviderDetailsType"/> 776 776 777 <xs:element name="WAFProvider" substitutionGroup="dpw:ProviderType" 778 type="dpw:WAFProviderDetailsType"/> 777 779 <xs:complexType name="ProviderDetailsType" abstract="true"/> 778 780 <xs:complexType name="OAIProviderDetailsType"> … … 817 819 </xs:complexType> 818 820 821 <xs:complexType name="WAFProviderDetailsType"> 822 <xs:complexContent> 823 <xs:extension base="dpw:ProviderDetailsType"> 824 <xs:sequence> 825 <xs:element name="timestamp" type="xs:dateTime" minOccurs="0"/> 826 </xs:sequence> 827 </xs:extension> 828 </xs:complexContent> 829 </xs:complexType> 819 830 <xs:complexType name="TimerInfoCommonType"> 820 831 <xs:sequence> -
mauRepo/revitalizationProject/branches/MEDIN/dpws/pom.xml
r8121 r8123 49 49 <properties> 50 50 <version.saxon>9.1.0.8</version.saxon> 51 <version.commons-io>2.0.1</version.commons-io> 52 <version.commons-collections>3.2</version.commons-collections> 51 53 </properties> 52 54 -
mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services/discovery/basic/DiscoveryBasicDPWS.java
r8094 r8123 1 /* BSD Licence 2 * Copyright (c) 2012, Science & Technology Facilities Council (STFC) 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 6 * - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 7 * - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the 8 * documentation and/or other materials provided with the distribution. 9 * - Neither the name of the Science & Technology Facilities Council (STFC) nor the names of its contributors may be used to endorse or promote 10 * products derived from this software without specific prior written permission. 11 * 12 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 13 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 14 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE 15 * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 16 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 17 * DAMAGE. 18 */ 1 19 package ndg.services.discovery.basic; 2 20 … … 7 25 import java.util.Properties; 8 26 import java.util.ResourceBundle; 9 10 import javax.security.auth.callback.LanguageCallback;11 27 12 28 import ndg.common.MessageFormatter; … … 20 36 import org.apache.log4j.Logger; 21 37 22 import antlr.StringUtils;23 24 38 /** 25 39 * Contains the main objects which support the marin service 26 40 * 27 * @author Maurizio Nagni <maurizio.nagni@stcf.ac.uk>41 * @author Maurizio Nagni 28 42 **/ 29 43 public class DiscoveryBasicDPWS { … … 143 157 144 158 private void loadConfigurationStream(InputStream in) throws IOException, ResourceNotAvailable { 145 if (in == null) 159 if (in == null) { 146 160 throw new ResourceNotAvailable(getFormatter().getFormattedText( 147 161 new NdgMessage("config.not.found.error", 148 162 new Object[] { NdgDictionary.DEFAULT_PROPERTIES_FILENAME }))); 163 } 164 149 165 configurationProperties = new Properties(); 150 166 try { -
mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services/discovery/basic/DiscoveryDictionaryDPWS.java
r8118 r8123 1 /* BSD Licence 2 * Copyright (c) 2012, Science & Technology Facilities Council (STFC) 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 6 * - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 7 * - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the 8 * documentation and/or other materials provided with the distribution. 9 * - Neither the name of the Science & Technology Facilities Council (STFC) nor the names of its contributors may be used to endorse or promote 10 * products derived from this software without specific prior written permission. 11 * 12 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 13 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 14 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE 15 * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 16 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 17 * DAMAGE. 18 */ 1 19 package ndg.services.discovery.basic; 2 20 … … 11 29 * Contains all the enum used in the MEDIN service 12 30 * 13 * @author Maurizio Nagni <maurizio.nagni@stcf.ac.uk>31 * @author Maurizio Nagni 14 32 * */ 15 33 public final class DiscoveryDictionaryDPWS { -
mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services/revitalization/ejb/discovery/DiscoveryService.java
r8121 r8123 1 /* BSD Licence 2 * Copyright (c) 2012, Science & Technology Facilities Council (STFC) 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 6 * - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 7 * - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the 8 * documentation and/or other materials provided with the distribution. 9 * - Neither the name of the Science & Technology Facilities Council (STFC) nor the names of its contributors may be used to endorse or promote 10 * products derived from this software without specific prior written permission. 11 * 12 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 13 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 14 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE 15 * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 16 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 17 * DAMAGE. 18 */ 1 19 package ndg.services.revitalization.ejb.discovery; 2 20 … … 27 45 28 46 /** 29 * DiscoveryServiceMEDIN Skeleton java skeleton for the axisService47 * DiscoveryServiceMEDIN 30 48 * 31 * @author Maurizio Nagni <maurizio.nagni@stcf.ac.uk>49 * @author Maurizio Nagni 32 50 */ 33 51 @Stateless(mappedName="DiscoveryService") -
mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services/revitalization/jpa/ServiceConfig.java
r8121 r8123 1 /* BSD Licence 2 * Copyright (c) 2012, Science & Technology Facilities Council (STFC) 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 6 * - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 7 * - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the 8 * documentation and/or other materials provided with the distribution. 9 * - Neither the name of the Science & Technology Facilities Council (STFC) nor the names of its contributors may be used to endorse or promote 10 * products derived from this software without specific prior written permission. 11 * 12 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 13 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 14 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE 15 * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 16 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 17 * DAMAGE. 18 */ 1 19 package ndg.services.revitalization.jpa; 2 20 -
mauRepo/revitalizationProject/branches/MEDIN/dpws/src/test/java/ndg/services/revitalization/ejb/discovery/DBTestBase.java
r8121 r8123 1 /* BSD Licence 2 * Copyright (c) 2012, Science & Technology Facilities Council (STFC) 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 6 * - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 7 * - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the 8 * documentation and/or other materials provided with the distribution. 9 * - Neither the name of the Science & Technology Facilities Council (STFC) nor the names of its contributors may be used to endorse or promote 10 * products derived from this software without specific prior written permission. 11 * 12 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 13 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 14 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE 15 * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 16 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 17 * DAMAGE. 18 */ 1 19 package ndg.services.revitalization.ejb.discovery; 2 20 -
mauRepo/revitalizationProject/branches/MEDIN/dpws/src/test/java/ndg/services/revitalization/harvest/WAFProviderTest.java
r8121 r8123 77 77 logger.debug("http.proxyPort: " + System.getProperty("http.proxyPort")); 78 78 //TO CHANGE!!!! 79 //System.setProperty("http.proxyHost", "wwwcache.rl.ac.uk"); 80 //System.setProperty("http.proxyPort", "8080"); 81 79 if (System.getProperty("http.proxyHost") == null) { 80 System.setProperty("http.proxyHost", "wwwcache.rl.ac.uk"); 81 System.setProperty("http.proxyPort", "8080"); 82 } 82 83 83 84 try { -
mauRepo/revitalizationProject/branches/MEDIN/pom.xml
r8118 r8123 18 18 <version.maven.resource.plugin>2.5</version.maven.resource.plugin> 19 19 <version.junit>4.8.1</version.junit> 20 <version.slf4j>1.6.1</version.slf4j> 20 <version.slf4j>1.6.1</version.slf4j> 21 21 </properties> 22 22
Note: See TracChangeset
for help on using the changeset viewer.