From e584293943eb1f2765d900ed18b1172f289efc66 Mon Sep 17 00:00:00 2001 From: Christopher Tubbs Date: Sun, 15 Nov 2015 02:59:29 -0500 Subject: [PATCH] Remove duplicates and fix broken classpath items in zkEnv --- zkEnv.sh | 88 ++++++++++++++++++++++++++++++++++++++++++++------ zookeeper.spec | 5 ++- 2 files changed, 83 insertions(+), 10 deletions(-) diff --git a/zkEnv.sh b/zkEnv.sh index 439ad1f..2cd43e8 100644 --- a/zkEnv.sh +++ b/zkEnv.sh @@ -62,19 +62,89 @@ fi ## TSTCLAIR: May need to add jar soup to classpath #add the zoocfg dir to classpath -CLASSPATH="/usr/share/java/objectweb-asm/asm.jar:/usr/share/java/antlr.jar:/usr/share/java/avalon-framework-api.jar:/usr/share/java/avalon-logkit.jar:/usr/share/java/cglib.jar:/usr/share/java/checkstyle.jar:/usr/share/java/commons-beanutils.jar:/usr/share/java/commons-cli.jar:/usr/share/java/commons-logging.jar:/usr/share/java/geronimo-jms_1.1_spec.jar:/usr/share/java/guava.jar:/usr/share/java/hamcrest/all.jar:/usr/share/java/hamcrest/core.jar:/usr/share/java/hamcrest/text.jar:/usr/share/java/hamcrest/library.jar:/usr/share/java/hamcrest/generator.jar:/usr/share/java/hamcrest/integration.jar:/usr/share/java/javax.mail/javax.mail.jar:/usr/share/java/jdiff.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/websocket-servlet.jar:/usr/share/java/jetty/jetty-rewrite.jar:/usr/share/java/jetty/jetty-jmx.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/jetty/jetty-client.jar:/usr/share/java/jetty/jetty-continuation.jar:/usr/share/java/jetty/jetty-jsp.jar:/usr/share/java/jetty/jetty-maven-plugin.jar:/usr/share/java/jetty/jetty-annotations.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty/websocket-client.jar:/usr/share/java/jetty/websocket-common.jar:/usr/share/java/jetty/jetty-proxy.jar:/usr/share/java/jetty/jetty-deploy.jar:/usr/share/java/jetty/websocket-api.jar:/usr/share/java/jetty/jetty-servlets.jar:/usr/share/java/jetty/websocket-server.jar:/usr/share/java/jetty/jetty-plus.jar:/usr/share/java/jetty/jetty-jndi.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-jaas.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/websocket-servlet.jar:/usr/share/java/jetty/jetty-rewrite.jar:/usr/share/java/jetty/jetty-jmx.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/jetty/jetty-client.jar:/usr/share/java/jetty/jetty-continuation.jar:/usr/share/java/jetty/jetty-jsp.jar:/usr/share/java/jetty/jetty-maven-plugin.jar:/usr/share/java/jetty/jetty-annotations.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty/websocket-client.jar:/usr/share/java/jetty/websocket-common.jar:/usr/share/java/jetty/jetty-proxy.jar:/usr/share/java/jetty/jetty-deploy.jar:/usr/share/java/jetty/websocket-api.jar:/usr/share/java/jetty/jetty-servlets.jar:/usr/share/java/jetty/websocket-server.jar:/usr/share/java/jetty/jetty-plus.jar:/usr/share/java/jetty/jetty-jndi.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-jaas.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/websocket-servlet.jar:/usr/share/java/jetty/jetty-rewrite.jar:/usr/share/java/jetty/jetty-jmx.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/jetty/jetty-client.jar:/usr/share/java/jetty/jetty-continuation.jar:/usr/share/java/jetty/jetty-jsp.jar:/usr/share/java/jetty/jetty-maven-plugin.jar:/usr/share/java/jetty/jetty-annotations.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty/websocket-client.jar:/usr/share/java/jetty/websocket-common.jar:/usr/share/java/jetty/jetty-proxy.jar:/usr/share/java/jetty/jetty-deploy.jar:/usr/share/java/jetty/websocket-api.jar:/usr/share/java/jetty/jetty-servlets.jar:/usr/share/java/jetty/websocket-server.jar:/usr/share/java/jetty/jetty-plus.jar:/usr/share/java/jetty/jetty-jndi.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-jaas.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/websocket-servlet.jar:/usr/share/java/jetty/jetty-rewrite.jar:/usr/share/java/jetty/jetty-jmx.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/jetty/jetty-client.jar:/usr/share/java/jetty/jetty-continuation.jar:/usr/share/java/jetty/jetty-jsp.jar:/usr/share/java/jetty/jetty-maven-plugin.jar:/usr/share/java/jetty/jetty-annotations.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty/websocket-client.jar:/usr/share/java/jetty/websocket-common.jar:/usr/share/java/jetty/jetty-proxy.jar:/usr/share/java/jetty/jetty-deploy.jar:/usr/share/java/jetty/websocket-api.jar:/usr/share/java/jetty/jetty-servlets.jar:/usr/share/java/jetty/websocket-server.jar:/usr/share/java/jetty/jetty-plus.jar:/usr/share/java/jetty/jetty-jndi.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-jaas.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/websocket-servlet.jar:/usr/share/java/jetty/jetty-rewrite.jar:/usr/share/java/jetty/jetty-jmx.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/jetty/jetty-client.jar:/usr/share/java/jetty/jetty-continuation.jar:/usr/share/java/jetty/jetty-jsp.jar:/usr/share/java/jetty/jetty-maven-plugin.jar:/usr/share/java/jetty/jetty-annotations.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty/websocket-client.jar:/usr/share/java/jetty/websocket-common.jar:/usr/share/java/jetty/jetty-proxy.jar:/usr/share/java/jetty/jetty-deploy.jar:/usr/share/java/jetty/websocket-api.jar:/usr/share/java/jetty/jetty-servlets.jar:/usr/share/java/jetty/websocket-server.jar:/usr/share/java/jetty/jetty-plus.jar:/usr/share/java/jetty/jetty-jndi.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-jaas.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jetty/jetty-security.jar:/usr/share/java/jetty/jetty-xml.jar:/usr/share/java/jetty/websocket-servlet.jar:/usr/share/java/jetty/jetty-rewrite.jar:/usr/share/java/jetty/jetty-jmx.jar:/usr/share/java/jetty/jetty-http.jar:/usr/share/java/jetty/jetty-servlet.jar:/usr/share/java/jetty/jetty-server.jar:/usr/share/java/jetty/jetty-client.jar:/usr/share/java/jetty/jetty-continuation.jar:/usr/share/java/jetty/jetty-jsp.jar:/usr/share/java/jetty/jetty-maven-plugin.jar:/usr/share/java/jetty/jetty-annotations.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty/websocket-client.jar:/usr/share/java/jetty/websocket-common.jar:/usr/share/java/jetty/jetty-proxy.jar:/usr/share/java/jetty/jetty-deploy.jar:/usr/share/java/jetty/websocket-api.jar:/usr/share/java/jetty/jetty-servlets.jar:/usr/share/java/jetty/websocket-server.jar:/usr/share/java/jetty/jetty-plus.jar:/usr/share/java/jetty/jetty-jndi.jar:/usr/share/java/jetty/jetty-util-ajax.jar:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar:/usr/share/java/jetty/jetty-webapp.jar:/usr/share/java/jetty/jetty-jaas.jar:/usr/share/java/jetty/jetty-io.jar:/usr/share/java/jline.jar:/usr/share/java/jtoaster.jar:/usr/share/java/junit.jar:/usr/share/java/jzlib.jar:/usr/share/java/log4j.jar:/usr/share/java/mockito.jar:/usr/share/java/netty.jar:/usr/share/java/objenesis/objenesis-tck.jar:/usr/share/java/objenesis/objenesis.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/tomcat-servlet-api.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar:/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar:/usr/share/java/zookeeper/zookeeper-tests.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/api.jar:/usr/share/java/slf4j/slf4j-ext.jar:/usr/share/java/slf4j/slf4j-site.jar:/usr/share/java/slf4j/jcl.jar:/usr/share/java/slf4j/jul-to-slf4j.jar:/usr/share/java/slf4j/ext.jar:/usr/share/java/slf4j/jcl-over-slf4j.jar:/usr/share/java/slf4j/slf4j-migrator.jar:/usr/share/java/slf4j/migrator.jar" -CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-api.jar:/usr/share/java/slf4j/site.jar:/usr/share/java/slf4j/jdk14.jar:/usr/share/java/slf4j/slf4j-jcl.jar" +CLASSPATH="/usr/share/java/zookeeper/zookeeper.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/zookeeper/zookeeper-tests.jar" + +# This section is sorted for easy maintenance +CLASSPATH="$CLASSPATH:/usr/lib/java/jline1/jline-1.0.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/antlr.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/avalon-framework-api.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/avalon-logkit.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/cglib.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/checkstyle.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/commons-beanutils.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/commons-cli.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/commons-logging.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/geronimo-jms_1.1_spec.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/guava.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/hamcrest/all.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/hamcrest/core.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/hamcrest/generator.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/hamcrest/integration.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/hamcrest/library.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/hamcrest/text.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/javax.mail/javax.mail.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jdiff.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-annotations.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-client.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-continuation.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-deploy.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-http.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-io.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-jaas.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-jmx.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-jndi.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-jsp.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-maven-plugin.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-plus.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-proxy.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-rewrite.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-security.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-server.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-servlet.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-servlets.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-util-ajax.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-util.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-webapp.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-xml.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/websocket-api.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/websocket-client.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/websocket-common.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/websocket-server.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jetty/websocket-servlet.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jtoaster.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/junit.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/jzlib.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/mockito.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/netty.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/objectweb-asm/asm.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/objenesis/objenesis-tck.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/objenesis/objenesis.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/api.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/ext.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/jcl-over-slf4j.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/jul-to-slf4j.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/migrator.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/site.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-api.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-ext.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-migrator.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-site.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/tomcat-servlet-api.jar" # We use slf4j-log4j12.jar as our logging binding CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-log4j12.jar" # These Conflict with slf4j-log4j12.jar -#/usr/share/java/slf4j/slf4j-simple.jar:/usr/share/java/slf4j/simple.jar: -#/usr/share/java/slf4j/slf4j-nop.jar +#CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-jcl.jar" +#CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-nop.jar" +#CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-simple.jar" -# Explicitly add the log4j jars (from the log4j.noarch package) -CLASSPATH="$CLASSPATH:/usr/share/java/log4j-1.jar:/usr/share/java/log4j/log4j-core.jar:/usr/share/java/log4j/log4j-api.jar" +# Explicitly add the log4j 1.2 jars +CLASSPATH="$CLASSPATH:/usr/share/java/log4j-1.jar" +CLASSPATH="$CLASSPATH:/usr/share/java/log4j.jar" # Not required according to https://issues.apache.org/jira/browse/SOLR-2369 -# CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-jdk14.jar/usr/share/java/slf4j/log4j-over-slf4j.jar" +#CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/log4j-over-slf4j.jar" +#CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-jdk14.jar" diff --git a/zookeeper.spec b/zookeeper.spec index 9dba8f6..0db9296 100644 --- a/zookeeper.spec +++ b/zookeeper.spec @@ -5,7 +5,7 @@ Name: zookeeper Version: 3.4.6 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A high-performance coordination service for distributed applications License: ASL 2.0 and BSD URL: http://zookeeper.apache.org/ @@ -299,6 +299,9 @@ getent passwd zookeeper >/dev/null || \ %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README %changelog +* Sun Nov 15 2015 Christopher Tubbs - 3.4.6-14 +- Remove duplicates and fix broken classpath items in zkEnv + * Tue Nov 03 2015 Christopher Tubbs - 3.4.6-13 - Remove unused build dependency log4cxx