Author: rareddy Date: 2012-01-11 16:37:46 -0500 (Wed, 11 Jan 2012) New Revision: 3790 Modified: trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/file/main/module.xml trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/hive/main/module.xml trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/jdbc/main/module.xml trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/ldap/main/module.xml trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/loopback/main/module.xml trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/olap/main/module.xml trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/salesforce/main/module.xml trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/ws/main/module.xml trunk/connectors/translator-ws/pom.xml trunk/jboss-integration/pom.xml trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java trunk/pom.xml trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties Log: TEIID-1889: Removing the Log4J dependency Modified: trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml =================================================================== --- trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml 2012-01-11 21:20:41 UTC (rev 3789) +++ trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml 2012-01-11 21:37:46 UTC (rev 3790) @@ -10,7 +10,6 @@ <resource-root path="teiid-runtime-${project.version}.jar" /> <resource-root path="teiid-engine-${project.version}.jar" /> <resource-root path="teiid-admin-${project.version}.jar" /> - <resource-root path="teiid-cache-jbosscache-${project.version}.jar" /> <resource-root path="saxonhe-9.2.1.5.jar" /> <resource-root path="json-simple-1.1.jar" /> <resource-root path="conf" /> @@ -31,8 +30,6 @@ <module name="org.jboss.staxmapper" /> <module name="org.jboss.vfs" /> <module name="org.picketbox"/> - <!-- REMOVE DIRECT DEPENDENCY ON LOG4J, and use jboss logging --> - <module name="org.apache.log4j"/> <module name="org.jboss.as.network"/> <module name="org.jboss.as.security"/> <module name="org.jboss.as.server"/> Modified: trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/file/main/module.xml =================================================================== --- trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/file/main/module.xml 2012-01-11 21:20:41 UTC (rev 3789) +++ trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/file/main/module.xml 2012-01-11 21:37:46 UTC (rev 3790) @@ -9,8 +9,6 @@ <dependencies> <module name="javax.api"/> <module name="javax.resource.api"/> - <module name="org.apache.commons.logging" /> - <module name="org.apache.log4j"/> <module name="org.jboss.teiid.common-core" /> <module name="org.jboss.teiid.api" /> </dependencies> Modified: trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/hive/main/module.xml =================================================================== --- trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/hive/main/module.xml 2012-01-11 21:20:41 UTC (rev 3789) +++ trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/hive/main/module.xml 2012-01-11 21:37:46 UTC (rev 3790) @@ -9,8 +9,6 @@ <dependencies> <module name="javax.resource.api"/> <module name="javax.api"/> - <module name="org.apache.commons.logging" /> - <module name="org.apache.log4j"/> <module name="org.jboss.teiid.common-core" /> <module name="org.jboss.teiid.api" /> <module name="org.jboss.teiid.translator.jdbc" /> Modified: trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/jdbc/main/module.xml =================================================================== --- trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/jdbc/main/module.xml 2012-01-11 21:20:41 UTC (rev 3789) +++ trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/jdbc/main/module.xml 2012-01-11 21:37:46 UTC (rev 3790) @@ -9,8 +9,6 @@ <dependencies> <module name="javax.resource.api"/> <module name="javax.api"/> - <module name="org.apache.commons.logging" /> - <module name="org.apache.log4j"/> <module name="org.jboss.teiid.common-core" /> <module name="org.jboss.teiid.api" /> </dependencies> Modified: trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/ldap/main/module.xml =================================================================== --- trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/ldap/main/module.xml 2012-01-11 21:20:41 UTC (rev 3789) +++ trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/ldap/main/module.xml 2012-01-11 21:37:46 UTC (rev 3790) @@ -9,8 +9,6 @@ <dependencies> <module name="javax.api"/> <module name="javax.resource.api"/> - <module name="org.apache.commons.logging" /> - <module name="org.apache.log4j"/> <module name="org.jboss.teiid.common-core" /> <module name="org.jboss.teiid.api" /> </dependencies> Modified: trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/loopback/main/module.xml =================================================================== --- trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/loopback/main/module.xml 2012-01-11 21:20:41 UTC (rev 3789) +++ trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/loopback/main/module.xml 2012-01-11 21:37:46 UTC (rev 3790) @@ -9,8 +9,6 @@ <dependencies> <module name="javax.api"/> <module name="javax.resource.api"/> - <module name="org.apache.commons.logging" /> - <module name="org.apache.log4j"/> <module name="org.jboss.teiid.common-core" /> <module name="org.jboss.teiid.api" /> </dependencies> Modified: trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/olap/main/module.xml =================================================================== --- trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/olap/main/module.xml 2012-01-11 21:20:41 UTC (rev 3789) +++ trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/olap/main/module.xml 2012-01-11 21:37:46 UTC (rev 3790) @@ -8,8 +8,6 @@ <dependencies> <module name="javax.api"/> <module name="javax.resource.api"/> - <module name="org.apache.commons.logging" /> - <module name="org.apache.log4j"/> <module name="org.jboss.teiid.common-core" /> <module name="org.jboss.teiid.api" /> </dependencies> Modified: trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/salesforce/main/module.xml =================================================================== --- trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/salesforce/main/module.xml 2012-01-11 21:20:41 UTC (rev 3789) +++ trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/salesforce/main/module.xml 2012-01-11 21:37:46 UTC (rev 3790) @@ -8,8 +8,6 @@ <dependencies> <module name="javax.api"/> <module name="javax.resource.api"/> - <module name="org.apache.commons.logging" /> - <module name="org.apache.log4j"/> <module name="org.jboss.teiid.common-core" /> <module name="org.jboss.teiid.api" /> <module name="org.jboss.teiid.translator.salesforce.api"/> Modified: trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/ws/main/module.xml =================================================================== --- trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/ws/main/module.xml 2012-01-11 21:20:41 UTC (rev 3789) +++ trunk/build/kits/jboss-as7/modules/org/jboss/teiid/translator/ws/main/module.xml 2012-01-11 21:37:46 UTC (rev 3790) @@ -9,8 +9,6 @@ <module name="javax.xml.ws.api"/> <module name="javax.api"/> <module name="javax.resource.api"/> - <module name="org.apache.commons.logging" /> - <module name="org.apache.log4j"/> <module name="org.jboss.teiid.common-core" /> <module name="org.jboss.teiid.api" /> </dependencies> Modified: trunk/connectors/translator-ws/pom.xml =================================================================== --- trunk/connectors/translator-ws/pom.xml 2012-01-11 21:20:41 UTC (rev 3789) +++ trunk/connectors/translator-ws/pom.xml 2012-01-11 21:37:46 UTC (rev 3790) @@ -22,11 +22,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <scope>provided</scope> Modified: trunk/jboss-integration/pom.xml =================================================================== --- trunk/jboss-integration/pom.xml 2012-01-11 21:20:41 UTC (rev 3789) +++ trunk/jboss-integration/pom.xml 2012-01-11 21:37:46 UTC (rev 3790) @@ -91,12 +91,6 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>org.jboss.teiid</groupId> <artifactId>teiid-common-core</artifactId> <type>test-jar</type> Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2012-01-11 21:20:41 UTC (rev 3789) +++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2012-01-11 21:37:46 UTC (rev 3790) @@ -235,7 +235,7 @@ this.vdb.removeAttachment(MetadataStoreGroup.class); this.vdb.removeAttachment(IndexMetadataFactory.class); - LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50025, vdb, valid?"active":"inactive")); //$NON-NLS-1$ //$NON-NLS-2$ + LogManager.logInfo(LogConstants.CTX_RUNTIME, valid?RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40003,vdb.getName(), vdb.getVersion()):RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40006,vdb.getName(), vdb.getVersion())); } @Override Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-11 21:20:41 UTC (rev 3789) +++ trunk/pom.xml 2012-01-11 21:37:46 UTC (rev 3790) @@ -356,11 +356,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>1.1</version> Modified: trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties =================================================================== --- trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2012-01-11 21:20:41 UTC (rev 3789) +++ trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2012-01-11 21:37:46 UTC (rev 3790) @@ -72,7 +72,7 @@ recursive_delegation=For {0}.{1} VDB, recursive delegation {2} found. TEIID40012=For {0}.{1} VDB, Data Source "{2}" not found. datasource_replaced=For {0}.{1} VDB, Data Source "{2}" replaced with "{3}" -TEIID40003={0}.{1} status has been changed to active +TEIID40003={0}.{1} status has been set to "active" vdb_inactivated={0}.{1} status has been changed to inactive. Check the required translators and data sources! translator_added=Teiid translator "{0}" has been added. invalid_class={0} invalid type of class specified. Must be of type org.teiid.connector.api.Connector