[NPANDAY-231] remove openrdf ConnectionsRepository is no longer used, remove references to it and OpenRDF git-svn-id: https://svn.apache.org/repos/asf/incubator/npanday/trunk@1607246 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/LICENSE b/LICENSE index b928c46..bd42431 100644 --- a/LICENSE +++ b/LICENSE
@@ -207,8 +207,8 @@ License - Copyright © 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov, Charlie Poole - Copyright © 2000-2004 Philip A. Craig + Copyright � 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov, Charlie Poole + Copyright � 2000-2004 Philip A. Craig This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -220,7 +220,7 @@ original software. If you use this software in a product, an acknowledgment (see the following) in the product documentation is required. - Portions Copyright © 2002 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov or Copyright © 2000-2002 Philip A. Craig + Portions Copyright � 2002 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov or Copyright � 2000-2002 Philip A. Craig 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. @@ -228,44 +228,3 @@ 3. This notice may not be removed or altered from any source distribution. =========================================================================================================================== -=========================================================================================================================== -= The following libraries are licensed under BSD License: = -= = -= * info/aduna/aduna-collections/1.2/aduna-collections-1.2.jar = -= * info/aduna/aduna-concurrent/1.2/aduna-concurrent-1.2.jar = -= * info/aduna/aduna-io/1.2/aduna-io-1.2.jar = -= * info/aduna/aduna-iteration/1.2/aduna-iteration-1.2.jar = -= * info/aduna/aduna-lang/1.3/aduna-lang-1.3.jar = -= * info/aduna/aduna-net/1.2/aduna-net-1.2.jar = -= * info/aduna/aduna-text/1.2/aduna-text-1.2.jar = -= * info/aduna/aduna-xml/1.2/aduna-xml-1.2.jar = -= * org/openrdf/openrdf-model/2.0-beta5/openrdf-model-2.0-beta5.jar = -= * org/openrdf/openrdf-query/2.0-beta5/openrdf-query-2.0-beta5.jar = -= * org/openrdf/openrdf-queryalgebra-evaluation/2.0-beta5/openrdf-queryalgebra-evaluation-2.0-beta5.jar = -= * org/openrdf/openrdf-queryalgebra-model/2.0-beta5/openrdf-queryalgebra-model-2.0-beta5.jar = -= * org/openrdf/openrdf-queryparser-api/2.0-beta5/openrdf-queryparser-api-2.0-beta5.jar = -= * org/openrdf/openrdf-queryparser-serql/2.0-beta5/openrdf-queryparser-serql-2.0-beta5.jar = -= * org/openrdf/openrdf-queryparser-sparql/2.0-beta5/openrdf-queryparser-sparql-2.0-beta5.jar = -= * org/openrdf/openrdf-queryresultio-api/2.0-beta5/openrdf-queryresultio-api-2.0-beta5.jar = -= * org/openrdf/openrdf-repository-api/2.0-beta5/openrdf-repository-api-2.0-beta5.jar = -= * org/openrdf/openrdf-repository-sail/2.0-beta5/openrdf-repository-sail-2.0-beta5.jar = -= * org/openrdf/openrdf-rio-api/2.0-beta5/openrdf-rio-api-2.0-beta5.jar = -= * org/openrdf/openrdf-rio-rdfxml/2.0-beta5/openrdf-rio-rdfxml-2.0-beta5.jar = -= * org/openrdf/openrdf-sail-api/2.0-beta5/openrdf-sail-api-2.0-beta5.jar = -= * org/openrdf/openrdf-sail-inferencer/2.0-beta5/openrdf-sail-inferencer-2.0-beta5.jar = -= * org/openrdf/openrdf-sail-memory/2.0-beta5/openrdf-sail-memory-2.0-beta5.jar = -= * org/openrdf/openrdf-sail-nativerdf/2.0-beta5/openrdf-sail-nativerdf-2.0-beta5.jar = -=== === - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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 DAMAGE. - -===========================================================================================================================
diff --git a/components/dotnet-registry/pom.xml b/components/dotnet-registry/pom.xml index 6a615ff..3f0d281 100644 --- a/components/dotnet-registry/pom.xml +++ b/components/dotnet-registry/pom.xml
@@ -32,6 +32,7 @@ <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> </dependency> + <!-- TODO: review --> <dependency> <groupId>net.sf.kxml</groupId> <artifactId>kxml2</artifactId> @@ -41,21 +42,6 @@ <artifactId>xmlpull</artifactId> </dependency> <dependency> - <groupId>org.openrdf</groupId> - <artifactId>openrdf-repository-api</artifactId> - <version>2.0-beta5</version> - </dependency> - <dependency> - <groupId>org.openrdf</groupId> - <artifactId>openrdf-repository-sail</artifactId> - <version>2.0-beta5</version> - </dependency> - <dependency> - <groupId>org.openrdf</groupId> - <artifactId>openrdf-sail-memory</artifactId> - <version>2.0-beta5</version> - </dependency> - <dependency> <groupId>org.reflections</groupId> <artifactId>reflections</artifactId> <version>0.9.5</version>
diff --git a/components/dotnet-registry/src/main/java/npanday/registry/ConnectionsRepository.java b/components/dotnet-registry/src/main/java/npanday/registry/ConnectionsRepository.java deleted file mode 100644 index 542cf69..0000000 --- a/components/dotnet-registry/src/main/java/npanday/registry/ConnectionsRepository.java +++ /dev/null
@@ -1,155 +0,0 @@ -package npanday.registry; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import org.apache.maven.artifact.factory.ArtifactFactory; -import org.openrdf.repository.RepositoryException; -import org.openrdf.repository.sail.SailRepository; -import org.openrdf.sail.memory.MemoryStore; - -import javax.naming.OperationNotSupportedException; -import java.io.File; -import java.net.URL; -import java.util.Collections; -import java.util.HashSet; -import java.util.Hashtable; -import java.util.Set; -import java.util.logging.Logger; - -/** - * Repository for obtaining sets of DAOs. - * @plexus.component - * role="npanday.registry.ConnectionsRepository" - */ -public class ConnectionsRepository - implements Repository -{ - - private static Logger logger = Logger.getAnonymousLogger(); - - private Set<DataAccessObject> daos = new HashSet<DataAccessObject>(); - - private Hashtable properties; - - /** - * The artifact factory component, which is used for creating artifacts. - */ - private ArtifactFactory artifactFactory; - - /** - * Loads all the data access objects. This is considered a lazy load because the framework (plexus) invoke the - * ConnectionsRepository.load method, which in this case does nothing more than set the properties. It is up to the - * developer to explicitly call the lazy load method. This is done for performance reasons. - * - * @throws NPandayRepositoryException if there is a problem loading the DAOs - */ - public void lazyLoad() throws NPandayRepositoryException - { - long start = System.currentTimeMillis(); - - File dataDir = new File( System.getProperty( "user.home" ), ".npanday" ); - MemoryStore store = new MemoryStore( dataDir ); - store.setPersist( true ); - store.setSyncDelay( 0 ); - org.openrdf.repository.Repository rdfRepository = new SailRepository( store ); - try - { - rdfRepository.initialize(); - } - catch ( RepositoryException e ) - { - throw new NPandayRepositoryException("NPANDAY-080-005: Failed to initialized repository. Message = " + e.getMessage(), e ); - } - - Set<String> keys = properties.keySet(); - for ( String keyName : keys ) - { - if ( keyName.trim().startsWith( "dao:" ) ) - { - String daoClassName = (String) properties.get( keyName ); - try - { - Class c = Class.forName( daoClassName ); - Object o = c.getConstructor().newInstance(); - if ( !( o instanceof DataAccessObject ) ) - { - throw new NPandayRepositoryException( - "NPANDAY-080-000: dao tag references a class that does not implement the DataAccessObject interface." ); - } - DataAccessObject dao = (DataAccessObject) o; - - dao.init( rdfRepository, keyName, daoClassName ); - daos.add( dao ); - logger.finest( "NPANDAY-080-001: Adding data access object: Class Name = " + daoClassName ); - } - catch ( Exception e ) - { - throw new NPandayRepositoryException( - "NPANDAY-080-002: Problem instantiating the DAO Class: Class Name = " + daoClassName, e ); - } - catch ( Error e ) - { - throw new NPandayRepositoryException( - "NPANDAY-080-003: Problem instantiating the DAO Class: Class Name = " + daoClassName, e ); - } - } - } - logger.finest( "NPANDAY-080-004: Connection Start Up: Time = " + ( System.currentTimeMillis() - start ) ); - } - - public void load( URL source ) - throws NPandayRepositoryException - { - - } - - public void clearAll() - throws OperationNotSupportedException - { - throw new OperationNotSupportedException( ); - } - - /** - * @see Repository#reloadAll() - */ - public void reloadAll() - throws OperationNotSupportedException - { - throw new OperationNotSupportedException( ); - } - - /** - * The properties configured in the registry. - */ - public void setProperties( Hashtable props ) - { - properties = props; - } - - /** - * Returns unmodifiable set of all data access objects. - * - * @return unmodifiable set of all data access objects - */ - public Set<DataAccessObject> getDataAccessObjects() - { - return Collections.unmodifiableSet( daos ); - } -}
diff --git a/components/dotnet-registry/src/main/java/npanday/registry/impl/DataAccessObjectRegistryImpl.java b/components/dotnet-registry/src/main/java/npanday/registry/impl/DataAccessObjectRegistryImpl.java deleted file mode 100644 index 60f2696..0000000 --- a/components/dotnet-registry/src/main/java/npanday/registry/impl/DataAccessObjectRegistryImpl.java +++ /dev/null
@@ -1,157 +0,0 @@ -package npanday.registry.impl; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import npanday.registry.ConnectionsRepository; -import npanday.registry.DataAccessObject; -import npanday.registry.DataAccessObjectRegistry; -import npanday.registry.NPandayRepositoryException; -import npanday.registry.Repository; -import npanday.registry.RepositoryRegistry; - -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; -import java.util.logging.Logger; - -/** - * @plexus.component - * role="npanday.registry.DataAccessObjectRegistry" - */ -public class DataAccessObjectRegistryImpl - implements DataAccessObjectRegistry -{ - /** - * @plexus.requirement - */ - private RepositoryRegistry repositoryRegistry; - - private static Logger logger = Logger.getAnonymousLogger(); - - private boolean isConnectionsRepoLoaded = false; - - public Set<DataAccessObject> findAll() - { - Set<DataAccessObject> daos = new HashSet<DataAccessObject>(); - if ( repositoryRegistry == null ) - { - logger.warning( "NPANDAY-081-000: Repository registry has not been set" ); - return Collections.unmodifiableSet( daos ); - } - for ( String name : repositoryRegistry.getRepositoryNames() ) - { - Repository repository = repositoryRegistry.find( name ); - if ( repository instanceof ConnectionsRepository ) - { - ConnectionsRepository connectionsRepository = (ConnectionsRepository) repository; - if ( !isConnectionsRepoLoaded ) - { - try - { - connectionsRepository.lazyLoad(); - isConnectionsRepoLoaded = true; - } - catch ( NPandayRepositoryException e ) - { - logger.warning( "NPANDAY-081-003: " + e.getMessage() ); - return daos; - } - } - daos.addAll( ( (ConnectionsRepository) repository ).getDataAccessObjects() ); - } - } - return Collections.unmodifiableSet( daos ); - } - - public DataAccessObject find( String daoId ) - { - if ( repositoryRegistry == null ) - { - logger.warning( "NPANDAY-081-001: Repository registry has not been set" ); - return null; - } - for ( String name : repositoryRegistry.getRepositoryNames() ) - { - Repository repository = repositoryRegistry.find( name ); - if ( repository instanceof ConnectionsRepository ) - { - ConnectionsRepository connectionsRepository = (ConnectionsRepository) repository; - if ( !isConnectionsRepoLoaded ) - { - try - { - connectionsRepository.lazyLoad(); - isConnectionsRepoLoaded = true; - } - catch ( NPandayRepositoryException e ) - { - logger.warning( "NPANDAY-081-004: " + e.getMessage() ); - return null; - } - } - for ( DataAccessObject dao : ( connectionsRepository ).getDataAccessObjects() ) - { - if ( dao.getID().trim().equals( daoId ) ) - { - return dao; - } - } - } - } - return null; - } - - public Set<String> getDaoIds() - { - Set<String> daoIds = new HashSet<String>(); - if ( repositoryRegistry == null ) - { - logger.warning( "NPANDAY-081-002: Repository registry has not been set" ); - return Collections.unmodifiableSet( daoIds ); - } - for ( String name : repositoryRegistry.getRepositoryNames() ) - { - Repository repository = repositoryRegistry.find( name ); - if ( repository instanceof ConnectionsRepository ) - { - ConnectionsRepository connectionsRepository = (ConnectionsRepository) repository; - if ( !isConnectionsRepoLoaded ) - { - try - { - connectionsRepository.lazyLoad(); - isConnectionsRepoLoaded = true; - } - catch ( NPandayRepositoryException e ) - { - logger.warning( "NPANDAY-081-005: " + e.getMessage() ); - return Collections.unmodifiableSet( daoIds ); - } - } - for ( DataAccessObject dao : ( (ConnectionsRepository) repository ).getDataAccessObjects() ) - { - daoIds.add( dao.getID() ); - } - } - } - return Collections.unmodifiableSet( daoIds ); - } - -}
diff --git a/dist/npanday-installer/src/main/wix/License.rtf b/dist/npanday-installer/src/main/wix/License.rtf index 39d7a5e..eeeaf15 100644 --- a/dist/npanday-installer/src/main/wix/License.rtf +++ b/dist/npanday-installer/src/main/wix/License.rtf Binary files differ
diff --git a/pom.xml b/pom.xml index 76ffb75..ec6da19 100644 --- a/pom.xml +++ b/pom.xml
@@ -65,14 +65,6 @@ </snapshots> </repository> <repository> - <id>openrdf</id> - <name>OpenRDF Repository</name> - <url>http://repository.aduna-software.org/maven2</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <repository> <releases> <enabled>false</enabled> </releases>
diff --git a/site/src/site/apt/guide/devinfra/artifact-repository.apt b/site/src/site/apt/guide/devinfra/artifact-repository.apt index 6770279..dbd71f1 100644 --- a/site/src/site/apt/guide/devinfra/artifact-repository.apt +++ b/site/src/site/apt/guide/devinfra/artifact-repository.apt
@@ -76,10 +76,7 @@ For the NPanday releases, they can be obtained as above either from the <<<npanday>>> subdirectory of the downloaded repository, or from a Maven repository. - For the dependencies, there are two needs: - - * the Open RDF repository, which can be proxied from {{http://repository.aduna-software.org/maven2}}. - Only the <<<info/aduna/**>>> and <<<org/openrdf/**>>> artifacts need to be proxied. + For the dependencies, NUnit is needed: * 3rd party .NET dependencies. Some can be obtained from {{https://archiva-repository.apache.org/archiva/repository/3rdparty/}}, or they can be uploaded manually to your own managed repository. Currently, only NUnit is included there.
diff --git a/site/src/site/apt/guide/installation/index.apt.vm b/site/src/site/apt/guide/installation/index.apt.vm index 4284e7e..b4b9fd6 100644 --- a/site/src/site/apt/guide/installation/index.apt.vm +++ b/site/src/site/apt/guide/installation/index.apt.vm
@@ -60,7 +60,7 @@ * {{{http://npanday.codeplex.com/Release/ProjectReleases.aspx} Codeplex NPanday Download page}} - for downloading a full repository to install locally (releases before entering the Apache Incubator) - * Alternatively, you can obtain them directory using Maven. You will also need to include the repository {{http://repository.aduna-software.org/maven2}} for some dependencies. + * Alternatively, you can obtain them directory using Maven. In NPanday 1.1, the release is only made available as a Maven binary repository, or a source distribution. For information on how to build the project from source, see {{{../../developers/building.html} Building from Source}}