You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2005/09/04 03:05:45 UTC
cvs commit: jakarta-jmeter eclipse.classpath build.xml
sebb 2005/09/03 18:05:45
Modified: . Tag: rel-2-1 eclipse.classpath build.xml
Log:
Remove iSaSiLk references
Revision Changes Path
No revision
No revision
1.17.2.3 +2 -1 jakarta-jmeter/eclipse.classpath
Index: eclipse.classpath
===================================================================
RCS file: /home/cvs/jakarta-jmeter/eclipse.classpath,v
retrieving revision 1.17.2.2
retrieving revision 1.17.2.3
diff -u -r1.17.2.2 -r1.17.2.3
--- eclipse.classpath 17 Aug 2005 22:20:10 -0000 1.17.2.2
+++ eclipse.classpath 4 Sep 2005 01:05:42 -0000 1.17.2.3
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry output="build/jorphan" kind="src" path="src/jorphan"/>
+ <classpathentry output="build/junit" kind="src" path="src/junit"/>
<classpathentry output="build/test" kind="src" path="test/src"/>
<classpathentry output="build/protocol/jms" kind="src" path="src/protocol/jms"/>
<classpathentry output="build/protocol/mail" kind="src" path="src/protocol/mail"/>
- <classpathentry excluding="org/apache/jmeter/images/|org/apache/jmeter/resources/*.properties|org/apache/jmeter/util/keystore/PKCS12KeyStore.java" output="build/core" kind="src" path="src/core"/>
+ <classpathentry excluding="org/apache/jmeter/images/|org/apache/jmeter/resources/*.properties" output="build/core" kind="src" path="src/core"/>
<classpathentry output="build/components" kind="src" path="src/components"/>
<classpathentry output="build/functions" kind="src" path="src/functions"/>
<classpathentry output="build/protocol/http" kind="src" path="src/protocol/http"/>
1.206.2.4 +3 -11 jakarta-jmeter/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-jmeter/build.xml,v
retrieving revision 1.206.2.3
retrieving revision 1.206.2.4
diff -u -r1.206.2.3 -r1.206.2.4
--- build.xml 4 Sep 2005 00:05:25 -0000 1.206.2.3
+++ build.xml 4 Sep 2005 01:05:43 -0000 1.206.2.4
@@ -415,9 +415,6 @@
<available classname="javax.activation.DataHandler" classpathref="classpath"/>
</and>
</condition>
- <available classname="iaik.protocol.https.Handler" property="isasilk.present">
- <classpath refid="classpath"/>
- </available>
<available classname="bsh.Interpreter" property="beanshell.present">
<classpath refid="classpath"/>
</available>
@@ -436,10 +433,6 @@
<echo message="Classes for SSL not found in classpath"/>
</target>
- <target name="iaik-message" depends="check-libs" unless="isasilk.present">
- <echo message="Classes for IAIK iSaSiLk not found in classpath"/>
- </target>
-
<target name="mail-message" depends="check-libs" unless="javamail.complete">
<echo message="Classes for Mail support not found in classpath"/>
</target>
@@ -457,7 +450,7 @@
</target>
<target name="report-missing-libs"
- depends="ssl-message,iaik-message,mail-message,beanshell-message,bsf-message,jms-message"
+ depends="ssl-message,mail-message,beanshell-message,bsf-message,jms-message"
/>
<!--
@@ -477,7 +470,6 @@
<javac srcdir="${src.core}" destdir="${build.core}" optimize="${optimize}" source="${src.java.version}" debug="on" target="${target.java.version}" deprecation="${deprecation}" encoding="${encoding}">
<include name="**/*.java"/>
<exclude name="org/apache/jmeter/util/JsseSSLManager.java" unless="jsse.present"/>
- <exclude name="org/apache/jmeter/util/keystore/PKCS12KeyStore.java" unless="isasilk.present"/>
<exclude name="org/apache/jmeter/util/keystore/DefaultKeyStore.java" unless="jsse.present"/>
<classpath>
<path refid="classpath"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org