Reorganizing duplicate generated classed and instead using the stubs artifact - AIRAVATA-1621
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b25e0a5d Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b25e0a5d Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b25e0a5d Branch: refs/heads/queue-gfac-rabbitmq Commit: b25e0a5db9d137731a2bd0f9a7c2ed1368e6f0e7 Parents: 58c58cf Author: Suresh Marru <[email protected]> Authored: Thu Mar 5 23:29:26 2015 -0500 Committer: Suresh Marru <[email protected]> Committed: Thu Mar 5 23:29:26 2015 -0500 ---------------------------------------------------------------------- .../apache/airavata/common/utils/Constants.java | 4 +- .../credential-store-service/pom.xml | 268 +- .../credential/store/client/TestSSLClient.java | 8 +- .../store/cpi/CredentialStoreService.java | 6888 ------------------ .../store/cpi/cs_cpi_serviceConstants.java | 55 - .../store/datamodel/CertificateCredential.java | 1104 --- .../store/datamodel/CommunityUser.java | 589 -- .../store/datamodel/PasswordCredential.java | 698 -- .../store/datamodel/SSHCredential.java | 998 --- .../store/datamodel/csDataModelConstants.java | 55 - .../exception/CredentialStoreException.java | 397 - .../store/server/CredentialStoreServer.java | 4 +- .../server/CredentialStoreServerHandler.java | 10 +- 13 files changed, 150 insertions(+), 10928 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/b25e0a5d/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/Constants.java ---------------------------------------------------------------------- diff --git a/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/Constants.java b/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/Constants.java index fd17064..154bea1 100644 --- a/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/Constants.java +++ b/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/Constants.java @@ -41,8 +41,8 @@ public final class Constants { public static final String ORCHESTRATOR_SERVER_PORT = "orchestrator.server.port"; public static final String GFAC_SERVER_HOST = "gfac.server.host"; public static final String GFAC_SERVER_PORT = "gfac.server.port"; - public static final String CREDNETIAL_SERVER_HOST = "credential.store.server.host"; - public static final String CREDNETIAL_SERVER_PORT = "credential.store.server.port"; + public static final String CREDENTIAL_SERVER_HOST = "credential.store.server.host"; + public static final String CREDENTIAL_SERVER_PORT = "credential.store.server.port"; public static final String ZOOKEEPER_EXPERIMENT_CATALOG = "experiment-catalog"; public static final String ZOOKEEPER_APPCATALOG = "app-catalog"; public static final String ZOOKEEPER_RABBITMQ = "rabbit-mq"; http://git-wip-us.apache.org/repos/asf/airavata/blob/b25e0a5d/modules/credential-store/credential-store-service/pom.xml ---------------------------------------------------------------------- diff --git a/modules/credential-store/credential-store-service/pom.xml b/modules/credential-store/credential-store-service/pom.xml index d8af25f..1595ed6 100644 --- a/modules/credential-store/credential-store-service/pom.xml +++ b/modules/credential-store/credential-store-service/pom.xml @@ -11,144 +11,150 @@ OF ANY ~ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <parent> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata</artifactId> - <version>0.15-SNAPSHOT</version> - <relativePath>../../../pom.xml</relativePath> - </parent> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <parent> + <groupId>org.apache.airavata</groupId> + <artifactId>airavata</artifactId> + <version>0.15-SNAPSHOT</version> + <relativePath>../../../pom.xml</relativePath> + </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>airavata-credential-store</artifactId> - <name>Airavata Credential Store</name> - <description>Module to manage credentials</description> + <modelVersion>4.0.0</modelVersion> + <artifactId>airavata-credential-store</artifactId> + <name>Airavata Credential Store</name> + <description>Module to manage credentials</description> - <dependencies> - <dependency> - <groupId>edu.uiuc.ncsa.myproxy</groupId> - <artifactId>oa4mp-client-api</artifactId> - <version>${oa4mp.version}</version> - </dependency> - <dependency> + <dependencies> + <dependency> + <groupId>org.apache.airavata</groupId> + <artifactId>airavata-credential-store-stubs</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>edu.uiuc.ncsa.myproxy</groupId> + <artifactId>oa4mp-client-api</artifactId> + <version>${oa4mp.version}</version> + </dependency> + <dependency> <groupId>edu.uiuc.ncsa.myproxy</groupId> <artifactId>oa4mp-client-loader-oauth1</artifactId> <version>${oa4mp.version}</version> <exclusions> - <exclusion> - <groupId>net.oauth.core</groupId> - <artifactId>oauth-httpclient4</artifactId> - </exclusion> - <exclusion> - <groupId>net.oauth.core</groupId> - <artifactId>oauth-consumer</artifactId> - </exclusion> - <exclusion> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - </exclusion> - <exclusion> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - </exclusion> + <exclusion> + <groupId>net.oauth.core</groupId> + <artifactId>oauth-httpclient4</artifactId> + </exclusion> + <exclusion> + <groupId>net.oauth.core</groupId> + <artifactId>oauth-consumer</artifactId> + </exclusion> + <exclusion> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + </exclusion> + <exclusion> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.7</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <version>${derby.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derbyclient</artifactId> - <version>${derby.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derbynet</artifactId> - <version>${derby.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derbytools</artifactId> - <version>${derby.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-dbcp</groupId> - <artifactId>commons-dbcp</artifactId> - <version>1.4</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-common-utils</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.jcraft</groupId> - <artifactId>jsch</artifactId> - <version>0.1.50</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-email</artifactId> - <version>1.3.2</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-io</artifactId> - <version>1.3.2</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>${surefire.version}</version> - <inherited>true</inherited> - <configuration> - <systemPropertyVariables> - <credential.module.directory>${basedir}</credential.module.directory> - </systemPropertyVariables> - <excludes> - <exclude>**/DAOBaseTestCase.java</exclude> - <exclude>**/MappingDAOTest.java</exclude> - </excludes> - <testSourceDirectory>${basedir}\src\test\java\</testSourceDirectory> - </configuration> - </plugin> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.7</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + <version>${derby.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derbyclient</artifactId> + <version>${derby.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derbynet</artifactId> + <version>${derby.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derbytools</artifactId> + <version>${derby.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + <version>1.4</version> + </dependency> + <dependency> + <groupId>org.apache.airavata</groupId> + <artifactId>airavata-common-utils</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.jcraft</groupId> + <artifactId>jsch</artifactId> + <version>0.1.50</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-email</artifactId> + <version>1.3.2</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-io</artifactId> + <version>1.3.2</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${surefire.version}</version> + <inherited>true</inherited> + <configuration> + <systemPropertyVariables> + <credential.module.directory>${basedir}</credential.module.directory> + </systemPropertyVariables> + <excludes> + <exclude>**/DAOBaseTestCase.java</exclude> + <exclude>**/MappingDAOTest.java</exclude> + </excludes> + <testSourceDirectory>${basedir}\src\test\java\</testSourceDirectory> + </configuration> + </plugin> - </plugins> - <testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory> - <testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory> - <testResources> - <testResource> - <directory>${project.basedir}/src/test/resources</directory> - </testResource> - </testResources> - </build> + </plugins> + <testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory> + <testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory> + <testResources> + <testResource> + <directory>${project.basedir}/src/test/resources</directory> + </testResource> + </testResources> + </build> </project> http://git-wip-us.apache.org/repos/asf/airavata/blob/b25e0a5d/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/client/TestSSLClient.java ---------------------------------------------------------------------- diff --git a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/client/TestSSLClient.java b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/client/TestSSLClient.java index 12105e2..cc5ebb6 100644 --- a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/client/TestSSLClient.java +++ b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/client/TestSSLClient.java @@ -56,8 +56,8 @@ public class TestSSLClient { String keystorePath = ServerSettings.getCredentialStoreThriftServerKeyStorePath(); String keystorePWD = ServerSettings.getCredentialStoreThriftServerKeyStorePassword(); params.setTrustStore(keystorePath, keystorePWD); - final int serverPort = Integer.parseInt(ServerSettings.getSetting(Constants.CREDNETIAL_SERVER_PORT, "8960")); - final String serverHost = ServerSettings.getSetting(Constants.CREDNETIAL_SERVER_HOST, null); + final int serverPort = Integer.parseInt(ServerSettings.getSetting(Constants.CREDENTIAL_SERVER_PORT, "8960")); + final String serverHost = ServerSettings.getSetting(Constants.CREDENTIAL_SERVER_HOST, null); transport = TSSLTransportFactory.getClientSocket(serverHost, serverPort, 10000, params); TProtocol protocol = new TBinaryProtocol(transport); @@ -98,7 +98,7 @@ public class TestSSLClient { certificateCredential.setCommunityUser(communityUser); X509Certificate[] x509Certificates = new X509Certificate[1]; KeyStore ks = KeyStore.getInstance("JKS"); - File keyStoreFile = new File("/Users/chathuri/dev/airavata/credential-store/oa4mp/airavata.jks"); + File keyStoreFile = new File("/Users/smarru/code/airavata-master/modules/configuration/server/src/main/resources/airavata.jks"); FileInputStream fis = new FileInputStream(keyStoreFile); char[] password = "airavata".toCharArray(); ks.load(fis,password); @@ -114,7 +114,7 @@ public class TestSSLClient { System.out.println("Certificate Token :" + token); CertificateCredential credential = client.getCertificateCredential(token, "testGateway"); System.out.println("certificate : " + credential.getX509Cert()); - System.out.println("gateway name : " + credential.getCommunityUser().getGatewayNmae()); + System.out.println("gateway name : " + credential.getCommunityUser().getGatewayName()); }catch (TTransportException e) { e.printStackTrace(); } catch (TException e) {
