From 219968bbfc9f71e3e29ebaf7fc1c52d5d7c65ec3 Mon Sep 17 00:00:00 2001 From: Niranjan-K Date: Wed, 3 Dec 2014 17:06:35 +0530 Subject: [PATCH] Removed carbon.xml, log4j.properties, registry.xml & user-mgt.xml --- .../modules/distribution/src/assembly/bin.xml | 6 - .../src/repository/conf/carbon.xml | 625 ------------------ .../src/repository/conf/log4j.properties | 164 ----- .../src/repository/conf/registry.xml | 195 ------ .../src/repository/conf/user-mgt.xml | 343 ---------- 5 files changed, 1333 deletions(-) delete mode 100644 product/modules/distribution/src/repository/conf/carbon.xml delete mode 100644 product/modules/distribution/src/repository/conf/log4j.properties delete mode 100755 product/modules/distribution/src/repository/conf/registry.xml delete mode 100644 product/modules/distribution/src/repository/conf/user-mgt.xml diff --git a/product/modules/distribution/src/assembly/bin.xml b/product/modules/distribution/src/assembly/bin.xml index 78ccfc0230b..791ff93689b 100644 --- a/product/modules/distribution/src/assembly/bin.xml +++ b/product/modules/distribution/src/assembly/bin.xml @@ -20,14 +20,8 @@ **/axis2services/version/** **/pom.xml **/version.txt - **/carbon.xml - **/user-mgt.xml - **/registry.xml **/axis2/axis2.xml **/master-datasources.xml - **/org.wso2.carbon.identity.relyingparty.ui-3.1.0.SNAPSHOT.jar - **/org.wso2.carbon.identity.user.registration.ui-3.1.0.SNAPSHOT.jar - **/log4j.properties diff --git a/product/modules/distribution/src/repository/conf/carbon.xml b/product/modules/distribution/src/repository/conf/carbon.xml deleted file mode 100644 index c134855b431..00000000000 --- a/product/modules/distribution/src/repository/conf/carbon.xml +++ /dev/null @@ -1,625 +0,0 @@ - - - - - - - - - WSO2 Enterprise Mobile Platform - - - EMM - - - 1.1.0 - - - - - - - - - local:/${carbon.context}/services/ - - - - - - - MobilePlatform - - - - - - - org.wso2.carbon - - - / - - - - - - 15 - - - - - - - - - 0 - - - - - 9999 - - 11111 - - - - - - 10389 - - 8000 - - - - - - 5672 - - 8672 - - - - - - 10500 - - - - - - - org.wso2.carbon.tomcat.jndi.CarbonJavaURLContextFactory - - - - - - - - - java - - - - - - - - - - false - - - false - - - 600 - - - - false - false - - - - - - ${carbon.home}/repository/deployment/server/ - - - 15 - - - ${carbon.home}/repository/conf/axis2/axis2.xml - - - 30000 - - - ${carbon.home}/repository/deployment/client/ - - ${carbon.home}/repository/conf/axis2/axis2_client.xml - - true - - - - - - - - - - admin - Default Administrator Role - - - user - Default User Role - - - - - false - - - - - - - ${carbon.home}/repository/resources/security/wso2carbon.jks - - JKS - - wso2carbon - - wso2carbon - - wso2carbon - - - - - - ${carbon.home}/repository/resources/security/wso2carbon.jks - - JKS - - wso2carbon - - wso2carbon - - wso2carbon - - - - - - ${carbon.home}/repository/resources/security/client-truststore.jks - - JKS - - wso2carbon - - - - - - - - - - - - - - - - - - - UserManager - - - false - - - - - - - ${carbon.home}/tmp/work - - - - - - true - - - 10 - - - 30 - - - - - - 100 - - - - keystore - certificate - * - - org.wso2.carbon.ui.transports.fileupload.AnyFileUploadExecutor - - - - - jarZip - - org.wso2.carbon.ui.transports.fileupload.JarZipUploadExecutor - - - - dbs - - org.wso2.carbon.ui.transports.fileupload.DBSFileUploadExecutor - - - - tools - - org.wso2.carbon.ui.transports.fileupload.ToolsFileUploadExecutor - - - - toolsAny - - org.wso2.carbon.ui.transports.fileupload.ToolsAnyFileUploadExecutor - - - - - - - info - org.wso2.carbon.core.transports.util.InfoProcessor - - - wsdl - org.wso2.carbon.core.transports.util.Wsdl11Processor - - - wsdl2 - org.wso2.carbon.core.transports.util.Wsdl20Processor - - - xsd - org.wso2.carbon.core.transports.util.XsdProcessor - - - - - - false - false - true - svn - http://svnrepo.example.com/repos/ - username - password - true - - - - - - - - - - - - - - - ${require.carbon.servlet} - - - - - true - - - - - - - default repository - http://dist.wso2.org/p2/carbon/releases/4.2.0 - - - - - - - - true - - - - - - true - - diff --git a/product/modules/distribution/src/repository/conf/log4j.properties b/product/modules/distribution/src/repository/conf/log4j.properties deleted file mode 100644 index 70f371f819d..00000000000 --- a/product/modules/distribution/src/repository/conf/log4j.properties +++ /dev/null @@ -1,164 +0,0 @@ -# -# Copyright 2009 WSO2, Inc. (http://wso2.com) -# -# 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. -# - -# -# This is the log4j configuration file used by WSO2 Carbon -# -# IMPORTANT : Please do not remove or change the names of any -# of the Appenders defined here. The layout pattern & log file -# can be changed using the WSO2 Carbon Management Console, and those -# settings will override the settings in this file. -# - -log4j.rootLogger=INFO, CARBON_CONSOLE, CARBON_LOGFILE, CARBON_MEMORY, CARBON_SYS_LOG - -log4j.logger.AUDIT_LOG=INFO, AUDIT_LOGFILE -log4j.logger.org.apache.axis2.wsdl.codegen.writer.PrettyPrinter=ERROR, CARBON_LOGFILE, CARBON_MEMORY -log4j.logger.org.apache.axis2.clustering=INFO, CARBON_CONSOLE, CARBON_LOGFILE -log4j.logger.org.apache=INFO, CARBON_LOGFILE, CARBON_MEMORY -log4j.logger.org.apache.catalina=WARN -log4j.logger.org.apache.tomcat=WARN -log4j.logger.org.wso2.carbon.apacheds=WARN -log4j.logger.org.apache.directory.server.ldap=WARN -log4j.logger.org.apache.directory.server.core.event=WARN -log4j.logger.com.atomikos=INFO,ATOMIKOS -log4j.logger.org.quartz=WARN -log4j.logger.org.apache.jackrabbit.webdav=WARN -log4j.logger.org.apache.juddi=ERROR -log4j.logger.org.apache.commons.digester.Digester=WARN -log4j.logger.org.apache.jasper.compiler.TldLocationsCache=WARN -log4j.logger.org.apache.qpid=WARN -log4j.logger.org.apache.qpid.server.Main=INFO -log4j.logger.qpid.message=WARN -log4j.logger.qpid.message.broker.listening=INFO -log4j.logger.org.apache.tiles=WARN -log4j.logger.org.apache.commons.httpclient=ERROR -log4j.logger.org.apache.coyote=WARN -log4j.logger.org.apache.solr=ERROR -log4j.logger.org.infinispan=WARN -log4j.logger.org.jgroups=ERROR -log4j.logger.me.prettyprint.cassandra.hector.TimingLogger=ERROR -log4j.logger.org.wso2=INFO -log4j.logger.org.apache.axis2.enterprise=FATAL, CARBON_LOGFILE, CARBON_MEMORY -log4j.logger.org.opensaml.xml=WARN, CARBON_LOGFILE, CARBON_MEMORY -log4j.logger.org.apache.directory.shared.ldap=WARN, CARBON_LOGFILE, CARBON_MEMORY -log4j.logger.org.apache.directory.server.ldap.handlers=WARN, CARBON_LOGFILE, CARBON_MEMORY -#Following are to remove false error messages from startup (IS) -log4j.logger.org.apache.directory.shared.ldap.entry.DefaultServerAttribute=FATAL, CARBON_LOGFILE, CARBON_MEMORY -log4j.logger.org.apache.directory.server.core.DefaultDirectoryService=ERROR, CARBON_LOGFILE, CARBON_MEMORY -log4j.logger.org.apache.directory.shared.ldap.ldif.LdifReader=ERROR, CARBON_LOGFILE, CARBON_MEMORY -log4j.logger.org.apache.directory.server.ldap.LdapProtocolHandler=ERROR, CARBON_LOGFILE, CARBON_MEMORY -log4j.logger.org.apache.directory.server.core=ERROR, CARBON_LOGFILE, CARBON_MEMORY -#Hive Related Log configurations -log4j.logger.DataNucleus=ERROR -log4j.logger.Datastore=ERROR -log4j.logger.Datastore.Schema=ERROR -log4j.logger.JPOX.Datastore=ERROR -log4j.logger.JPOX.Plugin=ERROR -log4j.logger.JPOX.MetaData=ERROR -log4j.logger.JPOX.Query=ERROR -log4j.logger.JPOX.General=ERROR -log4j.logger.JPOX.Enhancer=ERROR -log4j.logger.org.apache.hadoop.hive=WARN -log4j.logger.hive=WARN -log4j.logger.ExecMapper=WARN -log4j.logger.ExecReducer=WARN -log4j.logger.net.sf.ehcache=ERROR - -log4j.logger.trace.messages=TRACE,CARBON_TRACE_LOGFILE - -log4j.additivity.org.apache.axis2.clustering=false -log4j.additivity.com.atomikos=false - -# CARBON_CONSOLE is set to be a ConsoleAppender using a PatternLayout. -log4j.appender.CARBON_CONSOLE=org.apache.log4j.ConsoleAppender -log4j.appender.CARBON_CONSOLE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout -# ConversionPattern will be overridden by the configuration setting in the DB -log4j.appender.CARBON_CONSOLE.layout.ConversionPattern=[%d] %P%5p {%c} - %x %m%n -log4j.appender.CARBON_CONSOLE.layout.TenantPattern=%U%@%D[%T] -log4j.appender.CARBON_CONSOLE.threshold=DEBUG - -# CARBON_MEMORY is set to be a MemoryAppender using a PatternLayout. -log4j.appender.CARBON_MEMORY=org.wso2.carbon.logging.appenders.MemoryAppender -log4j.appender.CARBON_MEMORY.layout=org.apache.log4j.PatternLayout -log4j.appender.CARBON_MEMORY.bufferSize=200 -# ConversionPattern will be overridden by the configuration setting in the DB -#log4j.appender.CARBON_MEMORY.layout.ConversionPattern=[%d] %5p - %x %m {%c}%n -log4j.appender.CARBON_MEMORY.layout.ConversionPattern=[%d] %5p {%c} - %x %m%n -log4j.appender.CARBON_MEMORY.threshold=DEBUG - - -# CARBON_LOGFILE is set to be a DailyRollingFileAppender using a PatternLayout. -log4j.appender.CARBON_LOGFILE=org.apache.log4j.DailyRollingFileAppender -# Log file will be overridden by the configuration setting in the DB -# This path should be relative to WSO2 Carbon Home -log4j.appender.CARBON_LOGFILE.File=${carbon.home}/repository/logs/${instance.log}/wso2carbon${instance.log}.log -log4j.appender.CARBON_LOGFILE.Append=true -log4j.appender.CARBON_LOGFILE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout -# ConversionPattern will be overridden by the configuration setting in the DB -log4j.appender.CARBON_LOGFILE.layout.ConversionPattern=TID: [%T] [%S] [%d] %P%5p {%c} - %x %m {%c}%n -log4j.appender.CARBON_LOGFILE.layout.TenantPattern=%U%@%D [%T] [%S] -log4j.appender.CARBON_LOGFILE.threshold=DEBUG - -log4j.appender.CARBON_SYS_LOG = org.apache.log4j.net.SyslogAppender -log4j.appender.CARBON_SYS_LOG.layout=org.apache.log4j.PatternLayout -log4j.appender.CARBON_SYS_LOG.layout.ConversionPattern=[%d] %5p {%c} - %x %m {%c}%n -log4j.appender.CARBON_SYS_LOG.SyslogHost=localhost -log4j.appender.CARBON_SYS_LOG.Facility=USER -log4j.appender.CARBON_SYS_LOG.threshold=DEBUG - -# LOGEVENT is set to be a LogEventAppender using a PatternLayout to send logs to LOGEVENT -log4j.appender.LOGEVENT=org.wso2.carbon.logging.appender.LogEventAppender -log4j.appender.LOGEVENT.url=tcp://10.100.3.103:7611 -log4j.appender.LOGEVENT.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout -log4j.appender.LOGEVENT.columnList=%T,%S,%A,%d,%c,%p,%m,%H,%I,%Stacktrace -log4j.appender.LOGEVENT.userName=admin -log4j.appender.LOGEVENT.password=admin - -# Appender config to CARBON_TRACE_LOGFILE -log4j.appender.CARBON_TRACE_LOGFILE=org.apache.log4j.DailyRollingFileAppender -log4j.appender.CARBON_TRACE_LOGFILE.File=${carbon.home}/repository/logs/${instance.log}/wso2carbon-trace-messages${instance.log}.log -log4j.appender.CARBON_TRACE_LOGFILE.Append=true -log4j.appender.CARBON_TRACE_LOGFILE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout -log4j.appender.CARBON_TRACE_LOGFILE.layout.ConversionPattern=[%d] %P%5p {%c} - %x %m {%c}%n -log4j.appender.CARBON_TRACE_LOGFILE.layout.TenantPattern=%U%@%D [%T] [%S] -log4j.appender.CARBON_TRACE_LOGFILE.threshold=TRACE -log4j.additivity.trace.messages=false - -# Appender config to AUDIT_LOGFILE -log4j.appender.AUDIT_LOGFILE=org.apache.log4j.DailyRollingFileAppender -log4j.appender.AUDIT_LOGFILE.File=${carbon.home}/repository/logs/audit.log -log4j.appender.AUDIT_LOGFILE.Append=true -log4j.appender.AUDIT_LOGFILE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout -log4j.appender.AUDIT_LOGFILE.layout.ConversionPattern=[%d] %P%5p - %x %m %n -log4j.appender.AUDIT_LOGFILE.layout.TenantPattern=%U%@%D [%T] [%S] -log4j.appender.AUDIT_LOGFILE.threshold=INFO -log4j.additivity.AUDIT_LOG=false - -# Appender config to send Atomikos transaction logs to new log file tm.out. -log4j.appender.ATOMIKOS = org.apache.log4j.RollingFileAppender -log4j.appender.ATOMIKOS.File = repository/logs/tm.out -log4j.appender.ATOMIKOS.Append = true -log4j.appender.ATOMIKOS.layout = org.apache.log4j.PatternLayout -log4j.appender.ATOMIKOS.layout.ConversionPattern=%p %t %c - %m%n - -# This file is used to override the default logger settings, and is used to remove unwanted logs from Shindig appearing on the console. - -# Specification of Handler used by Console Logger -handlers=java.util.logging.ConsoleHandler - -# Replacing default INFO level with SEVERE -java.util.logging.ConsoleHandler.level=SEVERE diff --git a/product/modules/distribution/src/repository/conf/registry.xml b/product/modules/distribution/src/repository/conf/registry.xml deleted file mode 100755 index ee8ae46bf9f..00000000000 --- a/product/modules/distribution/src/repository/conf/registry.xml +++ /dev/null @@ -1,195 +0,0 @@ - - - - - - - - wso2registry - false - true - / - - - jdbc/WSO2CarbonDB - - - - - - - - - - -application/xacml-policy+xml - - - - - - - - - - - - - - - - 30 - 5 - - 50 - - 50 - - /_system/local/repository/components/org.wso2.carbon.registry/indexing/lastaccesstime - - - - - - - - - - - - true - - - - true - true - true - true - - diff --git a/product/modules/distribution/src/repository/conf/user-mgt.xml b/product/modules/distribution/src/repository/conf/user-mgt.xml deleted file mode 100644 index cb059ab060c..00000000000 --- a/product/modules/distribution/src/repository/conf/user-mgt.xml +++ /dev/null @@ -1,343 +0,0 @@ - - - - - - true - admin - - admin@admin.com - admin - - everyone - jdbc/WSO2CarbonDB - - - - - - - org.wso2.carbon.user.core.tenant.JDBCTenantManager - false - 100 - false - default - SHA-256 - true - true - true - false - ^[\S]{5,30}$ - ^[\S]{5,30}$ - ^[^~!#$;%^*+={}\\|\\\\<>,\'\"]{3,30}$ - ^[\S]{3,30}$ - ^[^~!#$;%^*+={}\\|\\\\<>,\'\"]{3,30}$ - ^[\S]{3,30}$ - true - 100 - 100 - false - false - - - - - - - - - - - - - - - - - - - /permission - true - - - - -