http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/0537b856/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/META-INF/spring-context.xml ---------------------------------------------------------------------- diff --git a/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/META-INF/spring-context.xml b/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/META-INF/spring-context.xml deleted file mode 100644 index 522f90b..0000000 --- a/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/META-INF/spring-context.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0"?> - -<!-- - ~ 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. - --> -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:context="http://www.springframework.org/schema/context"; - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-3.0.xsd"; - default-lazy-init="true"> - - <context:annotation-config /> - <context:component-scan base-package="org.apache.archiva.redback.users.jdo"/> - -</beans> \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/0537b856/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/org/apache/archiva/redback/users/jdo/messages.properties ---------------------------------------------------------------------- diff --git a/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/org/apache/archiva/redback/users/jdo/messages.properties b/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/org/apache/archiva/redback/users/jdo/messages.properties deleted file mode 100644 index a05e400..0000000 --- a/redback-users/redback-users-providers/redback-users-jdo/src/main/resources/org/apache/archiva/redback/users/jdo/messages.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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. -user.manager.cannot.add.user.without.username=User.username must be supplied on an .addUser() request. -user.manager.cannot.add.user.without.password=User.password must be supplied on an .addUser() request. http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/0537b856/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/archiva/redback/users/jdo/JdoUserManagerTest.java ---------------------------------------------------------------------- diff --git a/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/archiva/redback/users/jdo/JdoUserManagerTest.java b/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/archiva/redback/users/jdo/JdoUserManagerTest.java deleted file mode 100644 index 38167e3..0000000 --- a/redback-users/redback-users-providers/redback-users-jdo/src/test/java/org/apache/archiva/redback/users/jdo/JdoUserManagerTest.java +++ /dev/null @@ -1,117 +0,0 @@ -package org.apache.archiva.redback.users.jdo; - -/* - * 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.archiva.redback.components.jdo.DefaultConfigurableJdoFactory; -import org.apache.archiva.redback.common.jdo.test.StoreManagerDebug; -import org.apache.archiva.redback.users.UserManagerException; -import org.apache.archiva.redback.users.provider.test.AbstractUserManagerTestCase; -import org.jpox.AbstractPersistenceManagerFactory; -import org.jpox.SchemaTool; -import org.junit.Before; - -import javax.inject.Inject; -import javax.inject.Named; -import javax.jdo.PersistenceManager; -import javax.jdo.PersistenceManagerFactory; -import java.net.URL; -import java.util.Map; -import java.util.Properties; - -/** - * JdoUserManagerTest - * - * @author <a href="mailto:[email protected]";>Joakim Erdfelt</a> - */ -public class JdoUserManagerTest - extends AbstractUserManagerTestCase -{ - @Inject - @Named(value = "jdoFactory#users") - DefaultConfigurableJdoFactory jdoFactory; - - @Inject - @Named(value = "userManager#jdo") - JdoUserManager jdoUserManager; - - private StoreManagerDebug storeManager; - - @Before - public void setUp() - throws Exception - { - super.setUp(); - - jdoFactory.setPersistenceManagerFactoryClass( "org.jpox.PersistenceManagerFactoryImpl" ); //$NON-NLS-1$ - - jdoFactory.setDriverName( "org.hsqldb.jdbcDriver" ); //$NON-NLS-1$ - - jdoFactory.setUrl( "jdbc:hsqldb:mem:" + getName() ); //$NON-NLS-1$ - - jdoFactory.setUserName( "sa" ); //$NON-NLS-1$ - - jdoFactory.setPassword( "" ); //$NON-NLS-1$ - - jdoFactory.setProperty( "org.jpox.transactionIsolation", "READ_COMMITTED" ); //$NON-NLS-1$ //$NON-NLS-2$ - - jdoFactory.setProperty( "org.jpox.poid.transactionIsolation", "READ_COMMITTED" ); //$NON-NLS-1$ //$NON-NLS-2$ - - jdoFactory.setProperty( "org.jpox.autoCreateSchema", "true" ); //$NON-NLS-1$ //$NON-NLS-2$ - - Properties properties = jdoFactory.getProperties(); - - for ( Map.Entry<?, ?> entry : properties.entrySet() ) - { - System.setProperty( (String) entry.getKey(), (String) entry.getValue() ); - } - - PersistenceManagerFactory pmf = jdoFactory.getPersistenceManagerFactory(); - - assertNotNull( pmf ); - - /* set our own Store Manager to allow counting SQL statements */ - StoreManagerDebug.setup( (AbstractPersistenceManagerFactory) pmf ); - - SchemaTool.createSchemaTables( - new URL[]{ getClass().getResource( "/org/apache/archiva/redback/users/jdo/package.jdo" ) }, new URL[]{ }, - null, false, null ); //$NON-NLS-1$ - - PersistenceManager pm = pmf.getPersistenceManager(); - - pm.close(); - - setUserManager( jdoUserManager ); - - /* save the store manager to access the queries executed */ - JdoUserManager userManager = (JdoUserManager) getUserManager(); - storeManager = StoreManagerDebug.getConfiguredStoreManager( userManager.getPersistenceManager() ); - - } - - protected void assertCleanUserManager() - throws UserManagerException - { - // database cleanup - ( (JdoUserManager) getUserManager() ).eraseDatabase(); - super.assertCleanUserManager(); - } - - -} http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/0537b856/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/spring-context.xml ---------------------------------------------------------------------- diff --git a/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/spring-context.xml b/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/spring-context.xml deleted file mode 100644 index 23b30f8..0000000 --- a/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/spring-context.xml +++ /dev/null @@ -1,58 +0,0 @@ -<?xml version="1.0"?> - -<!-- - ~ 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. - --> -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:context="http://www.springframework.org/schema/context"; - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-3.0.xsd";> - - <bean name="jdoFactory#users" class="org.apache.archiva.redback.common.jdo.UserConfigurableJdoFactory"> - <constructor-arg> - <ref bean="userConfiguration#default"/> - </constructor-arg> - <!--property name="userConfiguration" ref="userConfiguration#default"/--> - <property name="driverName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:mem:redback-users-tests" /> - <property name="userName" value="sa"/> - <property name="password" value=""/> - </bean> - - <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration"> - <property name="registry" ref="test-conf"/> - </bean> - - <bean name="commons-configuration" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry"> - <property name="properties"> - <value> - <![CDATA[ - <configuration> - <properties fileName="test.properties" config-name="properties"/> - </configuration> - ]]> - </value> - </property> - </bean> - - <alias name="commons-configuration" alias="test-conf"/> - -</beans> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/0537b856/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/test.properties ---------------------------------------------------------------------- diff --git a/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/test.properties b/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/test.properties deleted file mode 100644 index aeb122f..0000000 --- a/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/test.properties +++ /dev/null @@ -1,17 +0,0 @@ -# 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. -jdbc.driver.name=org.hsqldb.jdbcDriver \ No newline at end of file
