Skip to content

D
dacapobench
Commit d731f18c authored by Rui Chen's avatar Rui Chen
1 Browse files
Options

Solved the wsappclient dependcy, solved the long starting of geronimo, rewrite part of codes

parent f501704d
Pipeline #2069 failed with stage
    in 31 minutes and 21 seconds
    Expand all Hide whitespace changes
    Inline Side-by-side
    Showing with 56 additions and 733 deletions
    benchmarks/bms/tradebeans/tradebeans.cnf
    View file @ d731f18c
    ......@@ -34,6 +34,6 @@ description
    author "Apache Geronimo, donated by IBM",
    license "Apache License, Version 2.0",
    url "http://geronimo.apache.org/",
    version "2.1.4",
    version "3.0.1",
    threads "Explicitly multi-threaded client, scaled to available processors. Internally multi-threaded server.",
    repeats "Populates a database with stocks and users, and then perfoms a number of trader actions organized as packets (trade sesions).";
    benchmarks/bms/tradesoap/tradesoap.cnf
    View file @ d731f18c
    ......@@ -34,6 +34,6 @@ description
    author "Apache Geronimo, donated by IBM",
    license "Apache License, Version 2.0",
    url "http://geronimo.apache.org/",
    version "2.1.4",
    version "3.0.1",
    threads "Explicitly multi-threaded client, scaled to available processors. Internally multi-threaded server.",
    repeats "Populates a database with stocks and users, and then perfoms a number of trader actions organized as packets (trade sesions).";
    benchmarks/default.properties
    View file @ d731f18c
    ......@@ -20,5 +20,5 @@ build.failonerror=true
    # automatically find them and compile successfully. If you have them
    # in non-standard locations, Derby needs to be told where to find the
    # class files. It should be sufficient to have a 1.6 JVM.
    j16lib=/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes
    jdk16home=/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home
    j17lib=/usr/lib/jvm/jdk1.7.0_80/jre
    jdk17home=/usr/lib/jvm/jdk1.7.0_80
    benchmarks/libs/daytrader/daytrader.patch
    View file @ d731f18c
    This diff is collapsed.
    benchmarks/libs/daytrader/daytrader/javaee6/modules/dacapo/pom.xml
    View file @ d731f18c
    ......@@ -92,7 +92,7 @@
    <configuration>
    <archive>
    <manifestEntries>
    <class-path>lib/wsappclient.jar web.jar lib/entities.jar lib/utils.jar</class-path>
    <class-path>web.jar lib/entities.jar lib/utils.jar</class-path>
    </manifestEntries>
    <manifest>
    <main-class>org.apache.geronimo.daytrader.javaee6.dacapo.dacapoclient.DaCapoClient</main-class>
    ......
    benchmarks/libs/daytrader/daytrader/javaee6/modules/wsappclient/NOTICE deleted 100644 → 0
    View file @ f501704d
    Apache Geronimo
    Copyright 2003-2009 The Apache Software Foundation
    This product includes software developed by
    The Apache Software Foundation (http://www.apache.org/).
    Portions of this software were developed at IBM and donated to the
    ASF under the Apache 2.0 license. The former work was referred to
    as Trade 6.
    benchmarks/libs/daytrader/daytrader/javaee6/modules/wsappclient/pom.xml deleted 100644 → 0
    View file @ f501704d
    <?xml version="1.0" encoding="UTF-8"?>
    <!--
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements. See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
    The ASF licenses this file to You 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.
    -->
    <project xmlns="http://maven.apache.org/POM/4.0.0"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
    http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
    <artifactId>modules</artifactId>
    <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
    <version>3.0-SNAPSHOT</version>
    </parent>
    <artifactId>wsappclient</artifactId>
    <name>DayTrader :: WS Application Client</name>
    <packaging>jar</packaging>
    <description>Client demonstrating Web Services</description>
    <scm>
    <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/wsappclient</connection>
    <developerConnection>
    scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/wsappclient</developerConnection>
    <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/wsappclient</url>
    </scm>
    <dependencies>
    <dependency>
    <groupId>org.apache.geronimo.specs</groupId>
    <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
    </dependency>
    </dependencies>
    <build>
    <plugins>
    <plugin>
    <artifactId>maven-jar-plugin</artifactId>
    <configuration>
    <!-- Caveat: The wsappclient module currently has a cyclic dependency on the EJB module. Thus we are forced
    to include a manual class-path entry pointing to the EJB module. When this is fixed
    remove the manifestEntries section below and this comment. -->
    <archive>
    <!-- manifestEntries>
    <class-path>dt-ejb.jar</class-path>
    </manifestEntries -->
    <manifest>
    <main-class>org.apache.geronimo.samples.daytrader.client.ws.ClientApp</main-class>
    </manifest>
    </archive>
    </configuration>
    </plugin>
    <!-- Caveat: Need to be replaced with axis plugin by Jesse
    <plugin>
    <groupId>org.codehaus.mojo</groupId>
    <artifactId>wsdl2java-maven-plugin</artifactId>
    <configuration>
    <packageSpace>org.apache.geronimo.samples.daytrader.client.ws</packageSpace>
    <serverSide>true</serverSide>
    </configuration>
    <executions>
    <execution>
    <phase>generate-sources</phase>
    <goals>
    <goal>generate</goal>
    </goals>
    </execution>
    </executions>
    </plugin>
    -->
    </plugins>
    </build>
    </project>
    benchmarks/libs/daytrader/daytrader/javaee6/modules/wsappclient/src/main/resources/META-INF/MANIFEST.MF deleted 100644 → 0
    View file @ f501704d
    Manifest-Version: 1.0
    Class-Path: ejb.jar
    Created-By: 1.4.2_08 (Sun Microsystems Inc.)
    Ant-Version: Apache Ant 1.5.4
    Main-Class: org.apache.geronimo.samples.daytrader.client.ws.ClientApp
    benchmarks/libs/daytrader/daytrader/javaee6/modules/wsappclient/src/main/resources/NOTICE deleted 100644 → 0
    View file @ f501704d
    Apache Geronimo
    Copyright 2003-2009 The Apache Software Foundation
    This product includes software developed by
    The Apache Software Foundation (http://www.apache.org/).
    Portions of this software were developed at IBM and donated to the
    ASF under the Apache 2.0 license. The former work was referred to
    as Trade 6.
    benchmarks/libs/daytrader/daytrader/javaee6/modules/wsappclient/src/test/org/apache/geronimo/samples/daytrader/AbstractTestCase.java deleted 100644 → 0
    View file @ f501704d
    /**
    * Licensed to the Apache Software Foundation (ASF) under one or more
    * contributor license agreements. See the NOTICE file distributed with
    * this work for additional information regarding copyright ownership.
    * The ASF licenses this file to You 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.
    */
    package org.apache.geronimo.samples.daytrader;
    import java.io.File;
    import junit.framework.TestCase;
    import junit.framework.TestSuite;
    /**
    * Abstract base class for test cases.
    *
    * @author <a href="jason@zenplex.com">Jason van Zyl</a>
    */
    public abstract class AbstractTestCase
    extends TestCase
    {
    /**
    * Basedir for all file I/O. Important when running tests from
    * the reactor.
    */
    public String basedir = System.getProperty("basedir");
    /**
    * Constructor.
    */
    public AbstractTestCase(String testName)
    {
    super(testName);
    }
    /**
    * Get test input file.
    *
    * @param path Path to test input file.
    */
    public String getTestFile(String path)
    {
    return new File(basedir,path).getAbsolutePath();
    }
    }
    benchmarks/libs/daytrader/daytrader/javaee6/modules/wsappclient/src/test/org/apache/geronimo/samples/daytrader/AppTest.java deleted 100644 → 0
    View file @ f501704d
    /**
    * Licensed to the Apache Software Foundation (ASF) under one or more
    * contributor license agreements. See the NOTICE file distributed with
    * this work for additional information regarding copyright ownership.
    * The ASF licenses this file to You 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.
    */
    package org.apache.geronimo.samples.daytrader;
    import junit.framework.Test;
    import junit.framework.TestCase;
    import junit.framework.TestSuite;
    /**
    * Unit test for simple App.
    *
    * @author <a href="mailto:jason@zenplex.com">Jason van Zyl</a>
    */
    public class AppTest
    extends AbstractTestCase
    {
    /**
    * Create the test case
    *
    * @param testName name of the test case
    */
    public AppTest( String testName )
    {
    super( testName );
    }
    /**
    * @return the suite of tests being tested
    */
    public static Test suite()
    {
    return new TestSuite( AppTest.class );
    }
    /**
    * Rigourous Test :-)
    */
    public void testApp()
    {
    assertEquals( "maven kicks ass", "maven kicks ass" );
    }
    }
    benchmarks/libs/daytrader/daytrader/javaee6/modules/wsappclient/src/test/org/apache/geronimo/samples/daytrader/NaughtyTest.java deleted 100644 → 0
    View file @ f501704d
    /**
    * Licensed to the Apache Software Foundation (ASF) under one or more
    * contributor license agreements. See the NOTICE file distributed with
    * this work for additional information regarding copyright ownership.
    * The ASF licenses this file to You 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.
    */
    package org.apache.geronimo.samples.daytrader;
    import junit.framework.Test;
    import junit.framework.TestCase;
    import junit.framework.TestSuite;
    /**
    * Unit test for simple App.
    *
    * @author <a href="mailto:jason@zenplex.com">Jason van Zyl</a>
    */
    public class NaughtyTest
    extends AbstractTestCase
    {
    /**
    * Create the test case
    *
    * @param testName name of the test case
    */
    public NaughtyTest( String testName )
    {
    super( testName );
    }
    /**
    * @return the suite of tests being tested
    */
    public static Test suite()
    {
    return new TestSuite( NaughtyTest.class );
    }
    /**
    * Rigourous Test :-)
    */
    public void testApp()
    {
    // Crash and burn!
    }
    }
    benchmarks/libs/daytrader/src/org/dacapo/daytrader/DaCapoClientRunner.java
    View file @ d731f18c
    ......@@ -31,8 +31,16 @@ public class DaCapoClientRunner {
    car = carName;
    /* Calling this function directly does not launch the client now. According to testing, it seems the getMain method of boot does not work properlly.
    Thus these ugly codes are temporarily used fot verifing that the whole framework works
    Will be changed once the problem is fixed
    */
    //ClientCLI.main(new String[] { car, "-i", "-t", numThreads + "", "-s", size, useBeans ? "-b" : "" });
    gero = System.getProperty("org.apache.geronimo.home.dir");
    ProcessBuilder pb = new ProcessBuilder("java", "-jar", "-Dkaraf.startLocalConsole=false",gero + "/bin/client.jar", car, "-i", "-t", numThreads + "", "-s", size, useBeans ? "-b" : "");
    String jhome= System.getProperty("java.home");
    ProcessBuilder pb = new ProcessBuilder(jhome + "/bin/java", "-jar", "-Dkaraf.startLocalConsole=false",gero + "/bin/client.jar", car, "-i", "-t", numThreads + "", "-s", size, useBeans ? "-b" : "");
    Process p = pb.start();
    p.waitFor();
    ......@@ -47,7 +55,15 @@ public class DaCapoClientRunner {
    try {
    ProcessBuilder pb = new ProcessBuilder("java", "-jar", "-Dkaraf.startLocalConsole=false", gero + "/bin/client.jar", car, "-t", numThreads + "", "-s", size, useBeans ? "-b" : "");
    /* Calling the function directly does not launch the client now. According to testing, it seems the getMain method of boot does not work properlly.
    Thus these ugly codes are temporarily used for checking the whole framework
    Will be changed once the problem is fixed
    */
    //ClientCLI.main(new String[] { car, "-i", "-t", numThreads + "", "-s", size, useBeans ? "-b" : "" });
    String jhome= System.getProperty("java.home");
    ProcessBuilder pb = new ProcessBuilder(jhome + "/bin/java", "-jar", "-Dkaraf.startLocalConsole=false", gero + "/bin/client.jar", car, "-t", numThreads + "", "-s", size, useBeans ? "-b" : "");
    Process p = pb.start();
    p.waitFor();
    ......
    benchmarks/libs/daytrader/src/org/dacapo/daytrader/DaCapoServerRunner.java
    View file @ d731f18c
    ......@@ -34,7 +34,7 @@ public class DaCapoServerRunner {
    boot = new Bootstrapper();
    final DaemonCLParser parser = new DaemonCLParser(System.out);
    parser.parse(new String[] { "--clean", "--quite" });
    parser.parse(new String[] { "-c", "-q" });
    boot.setWaitForStop(true);
    boot.setStartBundles(Arrays.asList("org.apache.geronimo.framework/j2ee-system//car"));
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment