Patch AIRS v0.8

Signed-off-by: Jaehyun Yoo <[email protected]>

META-INF/MANIFEST.MF

@@ -1,7 +1,6 @@
 Manifest-Version: 1.0
 Main-Class: com.sec.ose.osi.UIMain
 Class-Path: . 
- lib/airs/airs.jar 
  lib/airs/jcommander-1.30.jar 
  lib/dbconnector/mybatis-3.1.1.jar 
  lib/dbconnector/sqlite-jdbc-3.7.2.jar 

ReleaseNote.txt

@@ -38,6 +38,9 @@ ReleaseNote.txt - Release Note
 3. What's New
 --------------
 
+### OSI v0.8.2 20140719 (Protex SDK 6.3) ###
+Patch AIRS v0.8 (http://git.spdx.org/airs.git/)
+
 ### OSI v0.8.1 20140711 (Protex SDK 6.3) ###
 Improvement the report function 
 - remove "TEMPLATES" directory

src/com/sec/ose/airs/Properties.java

@@ -0,0 +1,29 @@
+/**
+ * Copyright(C) 2013-2014 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ *   Licensed 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.
+ *
+*/
+package com.sec.ose.airs;
+
+/**
+ * 
+ * 
+ * @author ytaek.kim
+ */
+public class Properties {
+	public static final String PROGRAM_NAME = "AIRS";
+	public static final String VERSION = "0.8";
+	public static final String AIRS_SPDX_VERSION = "1";
+	public static final String SUPPORTED_SPDX_VERSION = "1.1";
+}

src/com/sec/ose/airs/controller/cli/CLICommandAutoIdentify.java

@@ -0,0 +1,68 @@
+/**
+ * Copyright(C) 2013-2014 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ *   Licensed 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.
+ *
+*/
+package com.sec.ose.airs.controller.cli;
+
+import java.util.List;
+
+import com.beust.jcommander.Parameter;
+import com.beust.jcommander.Parameters;
+import com.beust.jcommander.ParametersDelegate;
+
+/**
+ * 
+ * 
+ * @author ytaek.kim
+ */
+@Parameters(commandDescription="Auto Identify")
+public class CLICommandAutoIdentify {
+	@Parameter(names = "--project-id", required = false, description="project id to export")
+	String projectId;
+	@Parameter(names = "--project-name", required = false, description="project name to export")
+	String projectName;
+	@Parameter(names = "--spdx-files", description="spdx file list to import/auto-identify")
+	List<String> fileList;
+
+	@ParametersDelegate
+	CLICommandLogin login = new CLICommandLogin();
+
+	// Getter and Setter
+	public String getProjectId() {
+		return projectId;
+	}
+	public void setProjectId(String projectId) {
+		this.projectId = projectId;
+	}
+	public List<String> getFileList() {
+		return fileList;
+	}
+	public void setFileList(List<String> fileList) {
+		this.fileList = fileList;
+	}
+	public CLICommandLogin getLogin() {
+		return login;
+	}
+	public void setLogin(CLICommandLogin login) {
+		this.login = login;
+	}
+	public String getProjectName() {
+		return projectName;
+	}
+	public void setProjectName(String projectName) {
+		this.projectName = projectName;
+	}
+
+}

src/com/sec/ose/airs/controller/cli/CLICommandExport.java

@@ -0,0 +1,108 @@
+/**
+ * Copyright(C) 2013-2014 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ *   Licensed 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.
+ *
+*/
+package com.sec.ose.airs.controller.cli;
+
+import com.beust.jcommander.Parameter;
+import com.beust.jcommander.Parameters;
+import com.beust.jcommander.ParametersDelegate;
+
+/**
+ * 
+ * 
+ * @author ytaek.kim
+ */
+@Parameters(commandDescription="- SPDX Export")
+public class CLICommandExport {
+	@Parameter(names = "--project-id", required = false, description="project id to export")
+	String projectId;
+	@Parameter(names = "--project-name", required = false, description="project name to export")
+	String projectName;
+	@Parameter(names = {"-o", "--export-file"}, description="export file name")
+	String filePath;
+
+	@Parameter(names = "--pkg-name", description="package name to be descripted in spdx file")
+	String packageName = "package";
+	@Parameter(names = "--pkg-file-name", description="package file name to be descripted in spdx file")
+	String packageFileName = "package file";
+	@Parameter(names = "--org-name", description="organization name to be descripted in spdx file")
+	String organizationName = "organization";
+	@Parameter(names = "--creator-name", description="creator name to be descripted in spdx file")
+	String creatorName = "creator";
+	@Parameter(names = "--creator-email", description="creator email to be descripted in spdx file")
+	String creatorEmail = "creator-email";
+
+	@ParametersDelegate
+	CLICommandLogin login = new CLICommandLogin();
+
+
+	// Getter and Setter
+	public String getProjectId() {
+		return projectId;
+	}
+	public void setProjectId(String projectId) {
+		this.projectId = projectId;
+	}
+	public String getFilePath() {
+		return filePath;
+	}
+	public void setFilePath(String filePath) {
+		this.filePath = filePath;
+	}
+	public String getPackageName() {
+		return packageName;
+	}
+	public void setPackageName(String packageName) {
+		this.packageName = packageName;
+	}
+	public String getPackageFileName() {
+		return packageFileName;
+	}
+	public void setPackageFileName(String packageFileName) {
+		this.packageFileName = packageFileName;
+	}
+	public String getOrganizationName() {
+		return organizationName;
+	}
+	public void setOrganizationName(String organizationName) {
+		this.organizationName = organizationName;
+	}
+	public String getCreatorName() {
+		return creatorName;
+	}
+	public void setCreatorName(String creatorName) {
+		this.creatorName = creatorName;
+	}
+	public String getCreatorEmail() {
+		return creatorEmail;
+	}
+	public void setCreatorEmail(String creatorEmail) {
+		this.creatorEmail = creatorEmail;
+	}
+	public CLICommandLogin getLogin() {
+		return login;
+	}
+	public void setLogin(CLICommandLogin login) {
+		this.login = login;
+	}
+	public String getProjectName() {
+		return projectName;
+	}
+	public void setProjectName(String projectName) {
+		this.projectName = projectName;
+	}
+
+}

src/com/sec/ose/airs/controller/cli/CLICommandLogin.java

@@ -0,0 +1,70 @@
+/**
+ * Copyright(C) 2013-2014 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ *   Licensed 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.
+ *
+*/
+package com.sec.ose.airs.controller.cli;
+
+import com.beust.jcommander.Parameter;
+
+/**
+ * 
+ * 
+ * @author ytaek.kim
+ */
+public class CLICommandLogin {
+	@Parameter(names = "-u", required = true, description="protex user id")
+	String user;
+	@Parameter(names = "-p", required = true, description="protex user password")
+	String password;
+	@Parameter(names = "-h", required = true, description="protex user host name (ip or url)")
+	String hostname;
+
+	@Parameter(names = "--proxy-host", description="proxy host")
+	String proxyHost;
+	@Parameter(names = "--proxy-port", description="proxy port")
+	String proxyPort;
+
+	// Getter and Setter	
+	public String getUser() {
+		return user;
+	}
+	public void setUser(String user) {
+		this.user = user;
+	}
+	public String getPassword() {
+		return password;
+	}
+	public void setPassword(String password) {
+		this.password = password;
+	}
+	public String getHostname() {
+		return hostname;
+	}
+	public void setHostname(String hostname) {
+		this.hostname = hostname;
+	}
+	public String getProxyHost() {
+		return proxyHost;
+	}
+	public void setProxyHost(String proxyHost) {
+		this.proxyHost = proxyHost;
+	}
+	public String getProxyPort() {
+		return proxyPort;
+	}
+	public void setProxyPort(String proxyPort) {
+		this.proxyPort = proxyPort;
+	}
+}