Anonymous avatar Anonymous committed 7431d86

Removing Ant build, minor Javadoc tweaks
XW-445

git-svn-id: http://svn.opensymphony.com/svn/xwork/trunk@1749 e221344d-f017-0410-9bd5-d282ab1896d7

Comments (0)

Files changed (15)

build.properties

-name=xwork
-version=2.1.1
-status=integration
-fullname = XWork
-cvs.tag = xwork_2-1-1

build.xml

-<project name="xwork" default="jar" basedir=".">
-    <!-- overridden properties (must be before the import!) -->
-    <property name="src.test" value="src/test"/>
-
-    <import file="osbuild.xml"/>
-
-    <target name="init" depends="common.init" unless="skip.ivy">
-        <taskdef name="ivy-configure" classname="fr.jayasoft.ivy.ant.IvyConfigure" classpathref="cp"/>
-        <taskdef name="ivy-resolve" classname="fr.jayasoft.ivy.ant.IvyResolve" classpathref="cp"/>
-        <taskdef name="ivy-retrieve" classname="fr.jayasoft.ivy.ant.IvyRetrieve" classpathref="cp"/>
-        <taskdef name="ivy-publish" classname="fr.jayasoft.ivy.ant.IvyPublish" classpathref="cp"/>
-        <taskdef name="ivy-report" classname="fr.jayasoft.ivy.ant.IvyReport" classpathref="cp"/>
-        <taskdef name="ivy-deliver" classname="fr.jayasoft.ivy.ant.IvyDeliver" classpathref="cp"/>
-
-        <ivy-retrieve/>
-    </target>
-
-    <target name="ivyrep.copy-ivy" depends="init" unless="noivyxml">
-        <ivy-deliver deliverpattern="${ivyrep.path}/opensymphony/${name}/[artifact]-[revision].[ext]"
-                     pubrevision="${version}-${TIME}" pubdate="${TIME}"/>
-    </target>
-
-    <target name="compile" depends="common.compile">
-    </target>
-
-    <target name="dist" depends="common.dist">
-    </target>
-
-    <target name="predist" depends="common.predist">
-        <!-- grab the README.txt file -->
-        <copy file="${src}/etc/README.txt" todir="${dist}"/>
-        <copy file="${src}/etc/LICENSE.txt" todir="${dist}"/>
-    </target>
-
-    <target name="test" depends="junit-check, compile, test-compile" description="run tests"
-            unless="skip.tests">
-        <run-junit />
-    </target>
-
-    <target name="docs.impl" depends="common.docs.impl">
-        <copy todir="${dist.docs}">
-            <fileset dir="${src.java}" includes="*.dtd"/>
-        </copy>
-    </target>
-
-    <!--target name="ivyrep" depends="common.ivyrep">
-        <antcall target="ivyrep.impl" inheritrefs="no" inheritall="no">
-            <param name="name" value="${name}-tiger"/>
-            <param name="noivyxml" value="yes"/>
-        </antcall>
-    </target-->
-
-    <target name="mavenrep" depends="jar">
-        <!-- xwork -->
-        <copy file="pom.xml" tofile="/opt/repository/ibiblio.org/opensymphony/poms/${name}-${version}-SNAPSHOT.pom" overwrite="true"/>
-        <copy file="${build}/${name}-${version}.jar" tofile="/opt/repository/ibiblio.org/opensymphony/jars/${name}-${version}-SNAPSHOT.jar" overwrite="true"/>
-        <copy file="${build}/${name}-${version}-sources.jar" tofile="/opt/repository/ibiblio.org/opensymphony/jars/${name}-${version}-SNAPSHOT-sources.jar" overwrite="true"/>
-        <copy file="${build}/${name}-${version}-javadoc.jar" tofile="/opt/repository/ibiblio.org/opensymphony/jars/${name}-${version}-SNAPSHOT-javadoc.jar" overwrite="true"/>
-
-        <copy file="pom.xml" tofile="/var/www/domains/opensymphony.com/maven1/htdocs/opensymphony/poms/${name}-${version}-SNAPSHOT.pom" overwrite="true"/>
-        <copy file="${build}/${name}-${version}.jar" tofile="/var/www/domains/opensymphony.com/maven1/htdocs/opensymphony/jars/${name}-${version}-SNAPSHOT.jar" overwrite="true"/>
-        <copy file="${build}/${name}-${version}-sources.jar" tofile="/var/www/domains/opensymphony.com/maven1/htdocs/opensymphony/jars/${name}-${version}-SNAPSHOT-sources.jar" overwrite="true"/>
-        <copy file="${build}/${name}-${version}-javadoc.jar" tofile="/var/www/domains/opensymphony.com/maven1/htdocs/opensymphony/jars/${name}-${version}-SNAPSHOT-javadoc.jar" overwrite="true"/>
-    </target>
-
-</project>

ivy.xml

-<?xml version="1.0" encoding="ISO-8859-1"?>
-<?xml-stylesheet type="text/xsl" href="http://www.jayasoft.fr/org/ivyrep/ivy-doc.xsl"?>
-<ivy-module version="1.0">
-    <info organisation="opensymphony" module="xwork"
-          revision="2.1.1"
-          status="integration"
-          publication="20071015000000">
-        <license name="Apache" url="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-        <ivyauthor name="opensymphony" url="http://www.opensymphony.com/"/>
-
-        <description homepage="http://www.opensymphony.com/xwork/">
-            XWork is an command-pattern framework that is used to power WebWork as well as other applications. XWork
-            provides an Inversion of Control container, a powerful expression language, data type conversion,
-            validation, and pluggable configuration.
-            <br/>
-        </description>
-    </info>
-    <configurations>
-        <conf name="build" description="Build-time requirements only" visibility="private"/>
-        <conf name="default" description="The xwork jar file"/>
-        <conf name="source" description="The xwork source files packaged as a jar"/>
-        <conf name="spring" description="The xwork jar file with Spring integration"/>
-    </configurations>
-    <publications>
-        <artifact name="xwork" type="jar" conf="default"/>
-        <!--artifact name="xwork-src" type="jar" conf="source"/-->
-    </publications>
-    <dependencies>
-        <!-- build -->
-        <dependency org="mockobjects" name="mockobjects-core" rev="0.09" conf="build->*"/>
-        <dependency org="mockobjects" name="mockobjects-jdk1.3" rev="0.09" conf="build->*"/>
-        <dependency org="mockobjects" name="mockobjects-alt-jdk1.3" rev="0.09" conf="build->*"/>
-        <dependency org="org.easymock" name="easymock" rev="2.0" conf="build->*"/>
-        <dependency org="cglib" name="cglib" rev="2.1_3" conf="build->*"/>
-
-        <dependency org="clover" name="clover" rev="1.3.11" conf="build->*"/>
-        <dependency org="junit" name="junit" rev="3.8.2" conf="build->*"/>
-        <dependency org="org/testng" name="testng" rev="5.1" conf="build->*"/>
-        <dependency org="dom4j" name="dom4j" rev="1.6" conf="build->*"/>
-        <dependency org="log4j" name="log4j" rev="1.2.9" conf="build->*"/>
-
-        <!-- default -->
-        <dependency org="opensymphony" name="oscore" rev="2.2.4" conf="default->*"/>
-        <dependency org="opensymphony" name="ognl" rev="2.6.11" conf="default->*"/>
-        <dependency org="rife" name="rife-continuations" rev="0.0.2" conf="default->*"/>
-        <dependency org="apache" name="commons-logging" rev="1.0.4" conf="default->*"/>
-        <dependency org="sun" name="javamail" rev="1.3.3" conf="default->*"/>
-
-        <!-- spring -->
-        <dependency org="org.springframework" name="spring" rev="2.0.7" conf="default->*"/>
-        <dependency org="org.springframework" name="spring-mock" rev="2.0.7" conf="default->*"/>
-        <dependency org="org.springframework" name="spring-aop" rev="2.0.7" conf="default->*"/>
-        <dependency org="org.springframework" name="spring-beans" rev="2.0.7" conf="default->*"/>
-        <dependency org="org.springframework" name="spring-context" rev="2.0.7" conf="default->*"/>
-        <dependency org="org.springframework" name="spring-core" rev="2.0.7" conf="default->*"/>
-        <dependency org="org.springframework" name="spring-web" rev="2.0.7" conf="default->*"/>
-
-        <dependency org="asm" name="asm" rev="1.5.3" conf="default->*"/>
-    </dependencies>
-</ivy-module>

ivyconf.properties

-ivy.retrieve.pattern = lib/[conf]/[artifact].[ext]

ivyconf.xml

-<ivyconf>
-    <properties file="ivyconf.properties"/>
-    <conf defaultResolver="default" checkUpToDate="true"/>
-    <resolvers>
-        <chain name="default">
-            <url name="opensymphony" checkmodified="true">
-                <ivy pattern="http://ivyrep.opensymphony.com/[organisation]/[module]/ivy-[revision].xml"/>
-                <artifact
-                        pattern="http://ivyrep.opensymphony.com/[organisation]/[module]/[artifact]-[revision].[type]"/>
-            </url>
-            <url name="spring">
-                <artifact pattern="https://svn.sourceforge.net/svnroot/springframework/repos/repo/[organisation]/[module]/[revision]/[module]-[revision].[type]"/>
-            </url>
-            <url name="contegix">
-                <ivy pattern="http://repository.contegix.com/ivyrep/[organisation]/[module]/ivy-[revision].xml"/>
-                <artifact
-                        pattern="http://repository.contegix.com/ivyrep/[organisation]/[module]/[artifact]-[revision].[type]"/>
-            </url>
-            <ivyrep name="ivyrep"/>
-            <ibiblio name="contegix-maven" root="http://repository.contegix.com/maven"/>
-            <url name="maven-mirror">
-                <artifact pattern="http://ibiblio.lsu.edu/main/pub/packages/maven/[organisation]/jars/[module]-[revision].[type]"/>
-            </url>
-            <url name="maven-mirror2">
-                <artifact pattern="http://mirrors.ibiblio.org/pub/mirrors/maven2/[organisation]/[module]/[revision]/[module]-[revision]-jdk15.[type]"/>
-            </url>
-            <url name="maven">
-                <artifact pattern="http://www.ibiblio.org/maven/[organisation]/jars/[module]-[revision].[type]"/>
-            </url>
-        </chain>
-    </resolvers>
-</ivyconf>

lib/.cvsignore

-*.jar
-default
-spring
-build
-pico
Add a comment to this file

lib/bootstrap/clover-license.jar

Binary file removed.

lib/bootstrap/clover.license

-Product: Clover
-License: Open Source License, 0.x, 1.x
-Issued: Sun Jan 12 2003 16:49:06 CST
-Expiry: Never
-Key: 95021d1a8d297dc7c24a4d55b
-Name: Patrick Lightbody
-Org: OpenSymphony
-Certificate: AAAB02+Ow8B7/zEbxOMqqKwwrdpP+a1COmJGHco7sCNLjHkHnajPF+dQW
-Ct12PMy0uml0s9xuus5wKngJ9OFk5PFeh01dzQF66bhXH1bvegLfvja3Kle6BYtDv4LZgE
-gk3E0aJN4IbgTn+TgUckSevXDR4KzK77NWJfrVzkxV3/JepMgS+gaUIj0h0mnUXI0d9L3d
-+Ly/oD4fPPUcM+l7THY/MeGoGxPE34jA+emuAgEC6n8WXzjy9zHEesXaA+2NGYLPMcCL3W
-EOyD9KZPr6k/XEjTzhk+N4BCr2lOgsk4meUx51XqzPkL/ZyOP4owbvVonAQ/L+GDj6aPFk
-WDo0jWpoOc30+HRw+FjC20je0yIpPcSA06h/l9485Kz11TtFSESojB/CyCOKDNpjHd57C2
-D4o9H1xtn89RVjso3ssxJg69Fa2VRYslQsDlN4ydagKqGVbpdNwA4jK0ms7LhkZsgrJdlm
-8btO9j7w8W7Nz88dy0G5/TuCARCra5efv7fg4we6A8/UqAheBU70gw4cow7Ivct1urqTd9
-XM+nAT5mtPq/WUp3rQjR+VmOMGbA/WOM7B+/ohkWsRiEBK83ocO3vs8nIKajzWsul/SDe+
-8/K8n4dJXdGLSygwlLtZhtmxDYQhP+14HrB1hsru9usIilX2v1DGzap25mlAHZxwhxFXPd
-OlbPJEIfwJ+MBSJ4uw9ef3Pt8wtIulNrAraTniIYyShlOc/vgrMuGmZTAObtza2oJAaztu
-87hSZYD0A5Al0hC7kOliEBe871Gl590e9tiSFiNokQ=
-License Agreement: CLOVER VERSION 1 (ONE) SOFTWARE LICENSE AGREEMENT
-
-1. Licenses and Software
-
-Cortex eBusiness Pty Ltd, an Australian Proprietary Limited Company
-("CENQUA") hereby grants to the purchaser (the "LICENSEE") a limited,
-revocable, worldwide, non-exclusive, non-transferable,
-non-sublicensable license to use the Clover version 1 (one) software
-(the "Software"), including any minor upgrades thereof during the Term
-(hereinafter defined) up to, but not including the next major version
-of the Software. The licensee shall not, or knowingly allow others to,
-reverse engineer, decompile, disassemble, modify, adapt, create
-derivative works from or otherwise attempt to derive source code from
-the Software provided. And, in accordance with the terms and
-conditions of this Software License Agreement (the "Agreement"), the
-Software shall be used solely by the licensed users in accordance with
-the following edition specific conditions:
-
-a) Server Edition
-
-A Server Edition license entitles the Licensee to execute one instance
-of Clover Server Edition on one (1) machine for the purposes of
-instrumenting source code and generating reports. There are no
-limitations on the use of the instrumented source code or generated
-reports produced by Server Edition.
-
-b) Workstation Edition
-
-A Workstation Edition license entitles the licensee to use Clover
-Workstation Edition on one (1) machine by one (1) individual end
-user. Workstation Edition does not permit the generation of reports
-for distribution.
-
-c) Team Edition
-
-A Team Edition license entitles the licensee to use Clover Team
-edition on any number of machines solely by the licensed number of
-users. Reports generated by Clover Team Edition are strictly for use
-only by the licensed number of individual end users.
-
-2. License Fee
-
-In exchange for the License(s), the Licensee shall pay to Cenqua a
-one-time, up front, non-refundable license fee. At the sole discretion
-of Cenqua this fee will be waived for non-commercial
-projects. Notwithstanding the Licensee's payment of the License Fee,
-Cenqua reserves the right to terminate the License if Cenqua discovers
-that the Licensee and/or the Licensee's use of the Software is in
-breach of this Agreement.
-
-3. Proprietary Rights
-
-Cenqua will retain all right, title and interest in and to the
-Software, all copies thereof, and Cenqua website(s), software, and
-other intellectual property, including, but not limited to, ownership
-of all copyrights, look and feel, trademark rights, design rights,
-trade secret rights and any and all other intellectual property and
-other proprietary rights therein. The Licensee will not directly or
-indirectly obtain or attempt to obtain at any time, any right, title
-or interest by registration or otherwise in or to the trademarks,
-service marks, copyrights, trade names, symbols, logos or designations
-or other intellectual property rights owned or used by Cenqua. All
-technical manuals or other information provided by Cenqua to the
-Licensee shall be the sole property of Cenqua.
-
-4. Term and Termination
-
-Subject to the other provisions hereof, this Agreement shall commence
-upon the Licensee's opting into this Agreement and continue until the
-Licensee discontinues use of the Software or the Agreement terminates
-automatically upon the Licensee's breach of any term or condition of
-this Agreement (the "Term"). Upon any such termination, the Licensee
-will delete the Software immediately.
-
-5. Copying & Transfer
-
-The Licensee may copy the Software for back-up purposes only. The
-Licensee may not assign or otherwise transfer the Software to any
-third party.
-
-6. Specific Disclaimer of Warranty and Limitation of Liability
-
-THE SOFTWARE IS PROVIDED WITHOUT WARRANTY OF ANY KIND. CENQUA
-DISCLAIMS ALL WARRANTIES, EXPRESSED OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO THE WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE. CENQUA WILL NOT BE LIABLE FOR ANY DAMAGES
-ASSOCIATED WITH THE SOFTWARE, INCLUDING, WITHOUT LIMITATION, ORDINARY,
-INCIDENTAL, INDIRECT, OR CONSEQUENTIAL DAMAGES OF ANY KIND, INCLUDING
-BUT NOT LIMITED TO DAMAGES RELATING TO LOST DATA OR LOST PROFITS, EVEN
-IF CENQUA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Warranties and Representations
-
-Licensee Indemnification. CENQUA agrees to indemnify, defend and hold
-the Licensee harmless from and against any and all liabilities, 
-damages, losses, claims, costs, and expenses (including reasonable 
-legal fees) arising out of or resulting from the Software or the use 
-thereof infringing upon, misappropriating or violating any patents, 
-copyrights, trademarks, or trade secret rights or other proprietary 
-rights of persons, firms or entities who are not parties to this 
-Agreement.
-
-CENQUA Indemnification. The Licensee warrants and represents that the 
-Licensee's actions with regard to the Software will be in compliance 
-with all applicable  laws; and the Licensee agrees to indemnify, 
-defend, and hold CENQUA harmless  from and against any and all 
-liabilities, damages, losses, claims, costs,  and expenses (including 
-reasonable legal fees) arising out of or resulting  from the 
-Licensee's failure to observe the use restrictions set forth herein.
-
-8. Publicity
-
-The Licensee grants permission for CENQUA to use Licensee's name 
-solely in customer lists. CENQUA shall not, without prior consent in 
-writing, use the Licensee's name, or that of its affiliates, in any 
-form with the specific  exception of customer lists. CENQUA agrees to 
-remove Licensee's name from  any and all materials within 7 days if 
-notified by the Licensee in writing.
-
-9. Governing Law
-
-This Agreement shall be governed by the laws of New South Wales, 
-Australia.
-
-10. Independent Contractors
-
-The parties are independent contractors with respect to each  other, 
-and nothing in this Agreement shall be construed as creating an 
-employer-employee  relationship, a partnership, agency relationship or 
-a joint venture between  the parties.
-
-11. Assignment
-
-This Agreement is not assignable or transferable by the Licensee. 
-CENQUA  in its sole discretion may transfer a license to a third party 
-at the written  request of the Licensee.
-
-12. Entire Agreement
-
-This Agreement constitutes the entire agreement between the parties 
-concerning  the Licensee's use of the Software. This Agreement 
-supersedes any prior verbal understanding between the parties and any 
-Licensee purchase order or other  ordering document, regardless of 
-whether such document is received by CENQUA  before or after execution 
-of this Agreement. This Agreement may be amended  only in writing by 
-CENQUA.
Add a comment to this file

lib/bootstrap/commons-cli.jar

Binary file removed.

Add a comment to this file

lib/bootstrap/commons-httpclient.jar

Binary file removed.

Add a comment to this file

lib/bootstrap/commons-logging.jar

Binary file removed.

Add a comment to this file

lib/bootstrap/ivy-1.1.jar

Binary file removed.

lib/build/.cvsignore

-*.jar

src/java/com/opensymphony/xwork2/ObjectFactory.java

  * This default implementation uses the {@link #buildBean(Class,java.util.Map) buildBean} 
  * method to create all classes (interceptors, actions, results, etc).
  * <p/>
- * To add lifecycle hook into an <code>ObjectFactory</code>, either or both of the following interfaces
- * could be implemented by the <code>ObjectFactory</code> itself.
- * <ul>
- * 		<li>{@link org.apache.struts2.util.ObjectFactoryInitializable}</li>
- *      <li>{@link org.apache.struts2.util.ObjectFactoryDestroyable}</li>
- * </ul>
- * Both will be invoked during the startup and showdown of {@link org.apache.struts2.dispatcher.FilterDispatcher} through {@link org.apache.struts2.dispatcher.Dispatcher}.
  *
  * @author Jason Carreira
  */

src/java/com/opensymphony/xwork2/util/reflection/ReflectionProvider.java

      * @param source   the source object.
      * @return  a Map with (key = read property name, value = value of read property).
      * @throws IntrospectionException is thrown if an exception occurs during introspection.
-     * @throws OgnlException is thrown by OGNL if the property value could not be retrieved
      */
     Map getBeanMap(Object source) throws IntrospectionException, ReflectionException;
     
      * Evaluates the given OGNL expression to extract a value from the given root
      * object in a given context
      *
-     * @see #parseExpression(String)
-     * @see #getValue(Object,Object)
      * @param expression the OGNL expression to be parsed
      * @param context the naming context for the evaluation
      * @param root the root object for the OGNL expression
      * @return the result of evaluating the expression
-     * @throws MethodFailedException if the expression called a method which failed
-     * @throws NoSuchPropertyException if the expression referred to a nonexistent property
-     * @throws InappropriateExpressionException if the expression can't be used in this context
-     * @throws OgnlException if there is a pathological environmental problem
      */
     Object getValue( String expression, Map context, Object root ) throws ReflectionException;
     
      * @param root the root object for the OGNL expression
      * @param context the naming context for the evaluation
      * @param value the value to insert into the object graph
-     * @throws MethodFailedException if the expression called a method which failed
-     * @throws NoSuchPropertyException if the expression referred to a nonexistent property
-     * @throws InappropriateExpressionException if the expression can't be used in this context
-     * @throws OgnlException if there is a pathological environmental problem
      */
     void setValue( String expression, Map context, Object root, Object value ) throws ReflectionException;
     
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.