Merge pull request #326 from uvindra/1.9.x

Fixing SQL compatibility issues and automating distribution of migration client

modules/distribution/resources/migration-1.8.0_to_1.9.0/wso2-api-migration-client/pom.xml

@@ -90,6 +90,25 @@
  </instructions>
  </configuration>
  </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.5.3</version>
+ <executions>
+ <execution>
+ <id>dist</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptor>src/assembly/dist.xml</descriptor>
+ <finalName>wso2-api-migration-client</finalName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
  </plugins>
  </build>
 

modules/distribution/resources/migration-1.8.0_to_1.9.0/wso2-api-migration-client/src/assembly/dist.xml

@@ -0,0 +1,29 @@
+<assembly>
+ <id>dist</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <files>
+ <file>
+ <source>${project.basedir}/src/main/resources/18to19Migration/sql-scripts/constraint/drop-fk.sql</source>
+ <outputDirectory>migration-scripts/18-19-migration</outputDirectory>
+ </file>
+ </files>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}/src/main/resources/18to19Migration/sql-scripts</directory>
+ <outputDirectory>migration-scripts/18-19-migration</outputDirectory>
+ <includes>
+ <include>*.sql</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>

modules/distribution/resources/migration-1.8.0_to_1.9.0/wso2-api-migration-client/src/main/java/org/wso2/carbon/apimgt/migration/client/MigrateFrom18to19.java

@@ -168,7 +168,7 @@ private void populateTenants(TenantManager tenantManager, List<Tenant> tenantLis
  */
  @Override
  public void databaseMigration(String migrateVersion) throws SQLException {
- log.info("Database migration for API Manager 1.8.0 started");
+ log.info("Database migration for API Manager " + Constants.VERSION_1_9 + " started");
  Connection connection = null;
  PreparedStatement preparedStatement = null;
  BufferedReader bufferedReader = null;
@@ -312,7 +312,7 @@ public void registryResourceMigration() throws APIMigrationException {
  * @throws APIMigrationException
  */
  void rxtMigration() throws APIMigrationException {
- log.info("Rxt migration for API Manager 1.9.0 started.");
+ log.info("Rxt migration for API Manager " + Constants.VERSION_1_9 + " started.");
  boolean isTenantFlowStarted = false;
  for (Tenant tenant : tenantsArray) {
  log.debug("Start rxtMigration for tenant " + tenant.getId() + "(" + tenant.getDomain() + ")");
@@ -446,7 +446,7 @@ void copyNewRxtFileToRegistry() throws APIMigrationException {
  * @throws APIMigrationException
  */
  void swaggerResourceMigration() throws APIMigrationException {
- log.info("Swagger migration for API Manager 1.9.0 started.");
+ log.info("Swagger migration for API Manager " + Constants.VERSION_1_9 + " started.");
  boolean isTenantFlowStarted = false;
 
  for (Tenant tenant : tenantsArray) {
@@ -944,7 +944,7 @@ private static JSONObject generatePathsObj(Map<String, JSONArray> apiDefinitionP
  */
  @Override
  public void cleanOldResources() throws APIMigrationException {
- log.info("Resource cleanup started for API Manager 1.9.0");
+ log.info("Resource cleanup started for API Manager " + Constants.VERSION_1_9);
  try {
  for (Tenant tenant : tenantsArray) {
  PrivilegedCarbonContext.startTenantFlow();

modules/distribution/resources/migration-1.8.0_to_1.9.0/wso2-api-migration-client/src/main/java/org/wso2/carbon/apimgt/migration/util/Constants.java

@@ -18,8 +18,6 @@
 
 public class Constants {
 
- public static final String VERSION_1_7 = "1.7";
- public static final String VERSION_1_8 = "1.8";
  public static final String VERSION_1_9 = "1.9";
  public static final String LINE_BREAK = "\\n";
  public static final String CONSTRAINT = "constraint";

modules/distribution/resources/migration-1.8.0_to_1.9.0/wso2-api-migration-client/src/main/java/org/wso2/carbon/apimgt/migration/util/ResourceUtil.java

@@ -109,13 +109,13 @@ public static String pickQueryFromResources(String migrateVersion, String queryT
 
  if (Constants.VERSION_1_9.equalsIgnoreCase(migrateVersion)) {
  //pick from 18to19Migration/sql-scripts
- resourcePath = CarbonUtils.getCarbonHome() + "/migration-scripts/18-19-migration/";
+ resourcePath = CarbonUtils.getCarbonHome() + File.separator + "migration-scripts" + File.separator + "18-19-migration" + File.separator;
  } else {
  throw new APIMigrationException("No query picked up for the given migrate version. Please check the migrate version.");
  }
 
  if (Constants.CONSTRAINT.equals(queryType)) {
- resourcePath = CarbonUtils.getCarbonHome() + "/migration-scripts/18-19-migration/";
+ resourcePath = CarbonUtils.getCarbonHome() + File.separator + "migration-scripts" + File.separator + "18-19-migration" + File.separator;
  //queryTobeExecuted = resourcePath + "drop-fk.sql";
  queryTobeExecuted = IOUtils.toString(new FileInputStream(new File(resourcePath + "drop-fk.sql")), "UTF-8");
  } else {

modules/distribution/resources/migration-1.8.0_to_1.9.0/wso2-api-migration-client/src/main/resources/18to19Migration/sql-scripts/h2.sql

@@ -11,8 +11,8 @@ ALTER TABLE AM_APPLICATION_REGISTRATION ADD INPUTS VARCHAR(256);
 ALTER TABLE AM_APPLICATION ADD GROUP_ID VARCHAR(100);
 ALTER TABLE AM_API ADD CONTEXT_TEMPLATE VARCHAR(256);
 UPDATE AM_API SET CONTEXT_TEMPLATE = CONTEXT WHERE CONTEXT_TEMPLATE IS NULL;
-UPDATE AM_API SET CONTEXT = concat(CONTEXT,'/',API_VERSION) WHERE CONTEXT NOT LIKE concat('%', API_VERSION);
-UPDATE IDN_OAUTH2_ACCESS_TOKEN SET TOKEN_SCOPE = concat(TOKEN_SCOPE, ' ', 'am_application_scope') WHERE USER_TYPE = 'APPLICATION' AND TOKEN_SCOPE NOT LIKE '%am_application_scope%';
+UPDATE AM_API SET CONTEXT = concat(CONTEXT,concat('/',API_VERSION)) WHERE CONTEXT NOT LIKE concat('%', API_VERSION);
+UPDATE IDN_OAUTH2_ACCESS_TOKEN SET TOKEN_SCOPE = concat(TOKEN_SCOPE, concat(' ', 'am_application_scope')) WHERE USER_TYPE = 'APPLICATION' AND TOKEN_SCOPE NOT LIKE '%am_application_scope%';
 UPDATE IDN_OAUTH2_ACCESS_TOKEN SET VALIDITY_PERIOD = -2000 WHERE VALIDITY_PERIOD = 9223372036854775807;
 ALTER TABLE AM_API ADD CREATED_BY VARCHAR(100);
 ALTER TABLE AM_API ADD CREATED_TIME TIMESTAMP;

modules/distribution/resources/migration-1.8.0_to_1.9.0/wso2-api-migration-client/src/main/resources/18to19Migration/sql-scripts/mssql.sql

@@ -6,8 +6,8 @@ ALTER TABLE AM_APPLICATION_REGISTRATION ADD TOKEN_SCOPE VARCHAR(256) DEFAULT 'de
 ALTER TABLE AM_APPLICATION_REGISTRATION ADD INPUTS VARCHAR(256);
 ALTER TABLE AM_API_LC_EVENT ALTER COLUMN USER_ID VARCHAR(255) NOT NULL;
 UPDATE AM_API SET CONTEXT_TEMPLATE = CONTEXT WHERE CONTEXT_TEMPLATE IS NULL;
-UPDATE AM_API SET CONTEXT = concat(CONTEXT,'/',API_VERSION) WHERE CONTEXT NOT LIKE concat('%', API_VERSION);
-UPDATE IDN_OAUTH2_ACCESS_TOKEN SET TOKEN_SCOPE = concat(TOKEN_SCOPE, ' ', 'am_application_scope') WHERE USER_TYPE = 'APPLICATION' AND TOKEN_SCOPE NOT LIKE '%am_application_scope%';
+UPDATE AM_API SET CONTEXT = CONTEXT + '/' + API_VERSION WHERE CONTEXT NOT LIKE '%' + API_VERSION;
+UPDATE IDN_OAUTH2_ACCESS_TOKEN SET TOKEN_SCOPE = TOKEN_SCOPE + ' ' + 'am_application_scope' WHERE USER_TYPE = 'APPLICATION' AND TOKEN_SCOPE NOT LIKE '%am_application_scope%';
 UPDATE IDN_OAUTH2_ACCESS_TOKEN SET VALIDITY_PERIOD = -2000 WHERE VALIDITY_PERIOD = 9223372036854775807;
 ALTER TABLE AM_API ADD CREATED_BY VARCHAR(100), CREATED_TIME DATETIME, UPDATED_BY VARCHAR(100), UPDATED_TIME DATETIME;
 ALTER TABLE AM_SUBSCRIBER ADD CREATED_BY VARCHAR(100), CREATED_TIME DATETIME, UPDATED_BY VARCHAR(100), UPDATED_TIME DATETIME;

modules/distribution/resources/migration-1.8.0_to_1.9.0/wso2-api-migration-client/src/main/resources/18to19Migration/sql-scripts/mysql.sql

@@ -11,8 +11,8 @@ ALTER TABLE IDN_OAUTH2_ACCESS_TOKEN MODIFY COLUMN TOKEN_SCOPE VARCHAR(767);
 ALTER TABLE AM_SUBSCRIBER MODIFY COLUMN USER_ID VARCHAR(255);
 ALTER TABLE AM_API ADD CONTEXT_TEMPLATE VARCHAR(256);
 UPDATE AM_API SET CONTEXT_TEMPLATE = CONTEXT WHERE CONTEXT_TEMPLATE IS NULL;
-UPDATE AM_API SET CONTEXT = concat(CONTEXT,'/',API_VERSION) WHERE CONTEXT NOT LIKE concat('%', API_VERSION);
-UPDATE IDN_OAUTH2_ACCESS_TOKEN SET TOKEN_SCOPE = concat(TOKEN_SCOPE, ' ', 'am_application_scope') WHERE USER_TYPE = 'APPLICATION' AND TOKEN_SCOPE NOT LIKE '%am_application_scope%';
+UPDATE AM_API SET CONTEXT = concat(CONTEXT,concat('/',API_VERSION)) WHERE CONTEXT NOT LIKE concat('%', API_VERSION);
+UPDATE IDN_OAUTH2_ACCESS_TOKEN SET TOKEN_SCOPE = concat(TOKEN_SCOPE, concat(' ', 'am_application_scope')) WHERE USER_TYPE = 'APPLICATION' AND TOKEN_SCOPE NOT LIKE '%am_application_scope%';
 UPDATE IDN_OAUTH2_ACCESS_TOKEN SET VALIDITY_PERIOD = -2000 WHERE VALIDITY_PERIOD = 9223372036854775807;
 ALTER TABLE AM_API ADD (CREATED_BY VARCHAR(100), CREATED_TIME TIMESTAMP, UPDATED_BY VARCHAR(100), UPDATED_TIME TIMESTAMP);
 ALTER TABLE AM_SUBSCRIBER ADD (CREATED_BY VARCHAR(100), CREATED_TIME TIMESTAMP, UPDATED_BY VARCHAR(100), UPDATED_TIME TIMESTAMP);

modules/distribution/resources/migration-1.8.0_to_1.9.0/wso2-api-migration-client/src/main/resources/18to19Migration/sql-scripts/oracle.sql

@@ -7,8 +7,8 @@ ALTER TABLE AM_APPLICATION MODIFY NAME VARCHAR2(100);
 ALTER TABLE AM_SUBSCRIBER MODIFY USER_ID VARCHAR2(255);
 ALTER TABLE AM_API ADD CONTEXT_TEMPLATE VARCHAR2(256);
 UPDATE AM_API SET CONTEXT_TEMPLATE = CONTEXT WHERE CONTEXT_TEMPLATE IS NULL;
-UPDATE AM_API SET CONTEXT = concat(CONTEXT,'/',API_VERSION) WHERE CONTEXT NOT LIKE concat('%', API_VERSION);
-UPDATE IDN_OAUTH2_ACCESS_TOKEN SET TOKEN_SCOPE = concat(TOKEN_SCOPE, ' ', 'am_application_scope') WHERE USER_TYPE = 'APPLICATION' AND TOKEN_SCOPE NOT LIKE '%am_application_scope%';
+UPDATE AM_API SET CONTEXT = concat(CONTEXT,concat('/',API_VERSION)) WHERE CONTEXT NOT LIKE concat('%', API_VERSION);
+UPDATE IDN_OAUTH2_ACCESS_TOKEN SET TOKEN_SCOPE = concat(TOKEN_SCOPE, concat(' ', 'am_application_scope')) WHERE USER_TYPE = 'APPLICATION' AND TOKEN_SCOPE NOT LIKE '%am_application_scope%';
 UPDATE IDN_OAUTH2_ACCESS_TOKEN SET VALIDITY_PERIOD = -2000 WHERE VALIDITY_PERIOD = 9223372036854775807;
 ALTER TABLE AM_API ADD (CREATED_BY VARCHAR2(100), CREATED_TIME DATE, UPDATED_BY VARCHAR2(100), UPDATED_TIME DATE);
 ALTER TABLE AM_SUBSCRIBER ADD (CREATED_BY VARCHAR2(100), CREATED_TIME DATE, UPDATED_BY VARCHAR2(100), UPDATED_TIME DATE);

modules/distribution/resources/migration-1.8.0_to_1.9.0/wso2-api-migration-client/src/main/resources/18to19Migration/sql-scripts/postgresql.sql

@@ -7,8 +7,8 @@ ALTER TABLE AM_APPLICATION_REGISTRATION ADD COLUMN INPUTS VARCHAR(256);
 ALTER TABLE AM_API_LC_EVENT ALTER COLUMN USER_ID TYPE VARCHAR(255);
 ALTER TABLE AM_API_LC_EVENT ALTER COLUMN USER_ID SET NOT NULL;
 UPDATE AM_API SET CONTEXT_TEMPLATE = CONTEXT WHERE CONTEXT_TEMPLATE IS NULL;
-UPDATE AM_API SET CONTEXT = concat(CONTEXT,'/',API_VERSION) WHERE CONTEXT NOT LIKE concat('%', API_VERSION);
-UPDATE IDN_OAUTH2_ACCESS_TOKEN SET TOKEN_SCOPE = concat(TOKEN_SCOPE, ' ', 'am_application_scope') WHERE USER_TYPE = 'APPLICATION' AND TOKEN_SCOPE NOT LIKE '%am_application_scope%';
+UPDATE AM_API SET CONTEXT = CONTEXT || '/' || API_VERSION WHERE CONTEXT NOT LIKE '%' || API_VERSION;
+UPDATE IDN_OAUTH2_ACCESS_TOKEN SET TOKEN_SCOPE = TOKEN_SCOPE || ' ' || 'am_application_scope' WHERE USER_TYPE = 'APPLICATION' AND TOKEN_SCOPE NOT LIKE '%am_application_scope%';
 UPDATE IDN_OAUTH2_ACCESS_TOKEN SET VALIDITY_PERIOD = -2000 WHERE VALIDITY_PERIOD = 9223372036854775807;
 ALTER TABLE AM_API ADD CREATED_BY VARCHAR(100), ADD CREATED_TIME DATE, ADD UPDATED_BY VARCHAR(100), ADD UPDATED_TIME DATE;
 ALTER TABLE AM_SUBSCRIBER ADD CREATED_BY VARCHAR(100), ADD CREATED_TIME DATE, ADD UPDATED_BY VARCHAR(100), ADD UPDATED_TIME DATE;