From 566c5e5fb59dcebe73b1fcc32364bf8417c0ed08 Mon Sep 17 00:00:00 2001 From: mharindu Date: Thu, 12 May 2016 22:02:47 +0530 Subject: [PATCH 1/8] fixed issues in API publishing --- .../api_templates/velocity_template.xml | 3 ++- modules/distribution/src/assembly/bin.xml | 13 +++++++++++++ .../src/repository/conf/api-manager.xml | 6 +++--- .../src/repository/conf/identity/identity.xml | 4 ++-- modules/p2-profile-gen/pom.xml | 7 +++++++ 5 files changed, 27 insertions(+), 6 deletions(-) diff --git a/modules/distribution/src/api-resources/api_templates/velocity_template.xml b/modules/distribution/src/api-resources/api_templates/velocity_template.xml index a3d2d0a8..c484f5f2 100644 --- a/modules/distribution/src/api-resources/api_templates/velocity_template.xml +++ b/modules/distribution/src/api-resources/api_templates/velocity_template.xml @@ -329,7 +329,6 @@ #end - ## check and set response caching #if($responseCacheEnabled) @@ -343,6 +342,7 @@ #if($handlers.size() > 0) #foreach($handler in $handlers) +#if($handler.className != 'org.wso2.carbon.apimgt.usage.publisher.APIMgtUsageHandler') #if($handler.hasProperties()) #set ($map = $handler.getProperties() ) @@ -352,6 +352,7 @@ #end #end +#end #end #end diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index fd1d311a..294727a4 100644 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -489,6 +489,13 @@ jagg/jagg.jag + + + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/api-publisher/ + + ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/api-publisher + + @@ -510,6 +517,12 @@ src/api-resources/synapse-configs/default/sequences ${pom.artifactId}-${pom.version}/repository/resources/apim-synapse-config/ + + + src/api-resources/synapse-configs/default/sequences + ${pom.artifactId}-${pom.version}/repository/deployment/server/server/synapse-configs/default/sequences + + src/api-resources/api_templates ${pom.artifactId}-${pom.version}/repository/resources/api_templates diff --git a/modules/distribution/src/repository/conf/api-manager.xml b/modules/distribution/src/repository/conf/api-manager.xml index 3e51cb89..22635c5e 100755 --- a/modules/distribution/src/repository/conf/api-manager.xml +++ b/modules/distribution/src/repository/conf/api-manager.xml @@ -26,7 +26,7 @@ jdbc/WSO2AM_DB - None + Synapse @@ -310,12 +310,12 @@ -ThriftServerHost - Allows to configure a hostname for the thrift server. It uses the carbon hostname by default. --> - ThriftClient + WSClient 10397 10000 10397 - true + false + + + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/webapp-publisher-config.xml + + ${pom.artifactId}-${pom.version}/repository/conf/etc + true + 644 + diff --git a/modules/distribution/src/repository/conf/identity/identity.xml b/modules/distribution/src/repository/conf/identity/identity.xml index daa82984..e289192c 100644 --- a/modules/distribution/src/repository/conf/identity/identity.xml +++ b/modules/distribution/src/repository/conf/identity/identity.xml @@ -157,7 +157,7 @@ - + From 9307bf1f0b2a92fff8badf4f416d759b504e523d Mon Sep 17 00:00:00 2001 From: mharindu Date: Mon, 16 May 2016 12:09:08 +0530 Subject: [PATCH 4/8] Fixed conflicts --- modules/distribution/src/repository/conf/cdm-config.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modules/distribution/src/repository/conf/cdm-config.xml b/modules/distribution/src/repository/conf/cdm-config.xml index 19a845e1..4ac277e3 100644 --- a/modules/distribution/src/repository/conf/cdm-config.xml +++ b/modules/distribution/src/repository/conf/cdm-config.xml @@ -57,10 +57,5 @@ - - - localhost - 9443 - From b69a539aee5225536763d0cc84d0da3059626514 Mon Sep 17 00:00:00 2001 From: mharindu Date: Mon, 16 May 2016 14:16:24 +0530 Subject: [PATCH 5/8] Added new logs --- .../src/repository/conf/log4j.properties | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/distribution/src/repository/conf/log4j.properties b/modules/distribution/src/repository/conf/log4j.properties index d3e55fb4..762c13cb 100644 --- a/modules/distribution/src/repository/conf/log4j.properties +++ b/modules/distribution/src/repository/conf/log4j.properties @@ -229,4 +229,14 @@ log4j.appender.EVENT_TRACE_APPENDER.layout.ConversionPattern=%d{HH:mm:ss,SSS} [% log4j.appender.EVENT_TRACE_MEMORYAPPENDER=org.wso2.carbon.utils.logging.appenders.MemoryAppender log4j.appender.EVENT_TRACE_MEMORYAPPENDER.bufferSize=2000 log4j.appender.EVENT_TRACE_MEMORYAPPENDER.layout=org.apache.log4j.PatternLayout -log4j.appender.EVENT_TRACE_MEMORYAPPENDER.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%X{ip}-%X{host}] [%t] %5p %m%n \ No newline at end of file +log4j.appender.EVENT_TRACE_MEMORYAPPENDER.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%X{ip}-%X{host}] [%t] %5p %m%n + +# Changing events specific info logs to warn +log4j.logger.org.wso2.carbon.application.deployer.internal.ApplicationManager=WARN +log4j.logger.org.wso2.carbon.event.stream.core.EventStreamDeployer=WARN +log4j.logger.org.wso2.carbon.event.input.adapter.core.internal.InputAdapterRuntime=WARN +log4j.logger.org.wso2.carbon.event.stream.core.internal.EventJunction=WARN +log4j.logger.org.wso2.carbon.event.receiver.core.EventReceiverDeployer=WARN +log4j.logger.org.wso2.carbon.analytics.spark.core.SparkScriptCAppDeployer=WARN +log4j.logger.org.wso2.carbon.analytics.eventsink.AnalyticsEventStoreDeployer=WARN +log4j.logger.org.wso2.carbon.event.processor.core.EventProcessorDeployer=WARN \ No newline at end of file From 46c054d567ba0356f580c99093dffe04aef0ca66 Mon Sep 17 00:00:00 2001 From: mharindu Date: Tue, 17 May 2016 09:01:23 +0530 Subject: [PATCH 6/8] Removed analytics from APIM fault sequence --- .../api-resources/synapse-configs/default/sequences/fault.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/distribution/src/api-resources/synapse-configs/default/sequences/fault.xml b/modules/distribution/src/api-resources/synapse-configs/default/sequences/fault.xml index 3b9e1846..b1e45ccc 100644 --- a/modules/distribution/src/api-resources/synapse-configs/default/sequences/fault.xml +++ b/modules/distribution/src/api-resources/synapse-configs/default/sequences/fault.xml @@ -58,7 +58,6 @@ -
From a88a20715d709cfa84a85a0bf181e77d05d9417b Mon Sep 17 00:00:00 2001 From: mharindu Date: Wed, 18 May 2016 11:50:36 +0530 Subject: [PATCH 7/8] Migrated to APIM 5.0.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2fd4e319..07a4708a 100644 --- a/pom.xml +++ b/pom.xml @@ -1127,7 +1127,7 @@ 2.1.0-SNAPSHOT - 5.0.3 + 5.0.4 4.5.1 From 870009915fb5c02c350aa9c3769027ded89aac8f Mon Sep 17 00:00:00 2001 From: mharindu Date: Thu, 19 May 2016 01:14:58 +0530 Subject: [PATCH 8/8] Removed api-publisher --- modules/distribution/src/assembly/bin.xml | 7 ------- modules/p2-profile-gen/pom.xml | 7 ------- 2 files changed, 14 deletions(-) diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 38086f80..017ec56d 100644 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -489,13 +489,6 @@ jagg/jagg.jag - - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/api-publisher/ - - ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/api-publisher - - diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml index eb47088b..8f887fbd 100644 --- a/modules/p2-profile-gen/pom.xml +++ b/modules/p2-profile-gen/pom.xml @@ -532,9 +532,6 @@ org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.store.feature:${carbon.api.mgt.version} - - org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.publisher.feature:${carbon.api.mgt.version} - org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.authenticator.oidc.feature:${carbon.api.mgt.version} @@ -1298,10 +1295,6 @@ org.wso2.carbon.apimgt.store.feature.group ${carbon.api.mgt.version} - - org.wso2.carbon.apimgt.publisher.feature.group - ${carbon.api.mgt.version} - org.wso2.carbon.apimgt.authenticator.oidc.feature.group ${carbon.api.mgt.version}