svn commit: r955413 - /uima/sandbox/trunk/aggregate-addons/pom.xml
Author: schor Date: Wed Jun 16 22:04:53 2010 New Revision: 955413 URL: http://svn.apache.org/viewvc?rev=955413&view=rev Log: [UIMA-1812] update version of parent-pom-top to 1 Modified: uima/sandbox/trunk/aggregate-addons/pom.xml Modified: uima/sandbox/trunk/aggregate-addons/pom.xml URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/aggregate-addons/pom.xml?rev=955413&r1=955412&r2=955413&view=diff == --- uima/sandbox/trunk/aggregate-addons/pom.xml (original) +++ uima/sandbox/trunk/aggregate-addons/pom.xml Wed Jun 16 22:04:53 2010 @@ -25,7 +25,7 @@ org.apache.uima parent-pom-top -1-SNAPSHOT +1
svn commit: r955412 - in /uima/uima-as/trunk: aggregate-uima-as-eclipse-plugins/pom.xml aggregate-uima-as/pom.xml
Author: schor Date: Wed Jun 16 22:04:28 2010 New Revision: 955412 URL: http://svn.apache.org/viewvc?rev=955412&view=rev Log: [UIMA-1812] update version of parent-pom-top to 1 Modified: uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml uima/uima-as/trunk/aggregate-uima-as/pom.xml Modified: uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml?rev=955412&r1=955411&r2=955412&view=diff == --- uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml (original) +++ uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml Wed Jun 16 22:04:28 2010 @@ -25,7 +25,7 @@ org.apache.uima parent-pom-top -1-SNAPSHOT +1 Modified: uima/uima-as/trunk/aggregate-uima-as/pom.xml URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/aggregate-uima-as/pom.xml?rev=955412&r1=955411&r2=955412&view=diff == --- uima/uima-as/trunk/aggregate-uima-as/pom.xml (original) +++ uima/uima-as/trunk/aggregate-uima-as/pom.xml Wed Jun 16 22:04:28 2010 @@ -26,7 +26,7 @@ org.apache.uima parent-pom-top -1-SNAPSHOT +1
svn commit: r955391 - /uima/build/trunk/parent-poms/pom.xml
Author: schor Date: Wed Jun 16 21:15:34 2010 New Revision: 955391 URL: http://svn.apache.org/viewvc?rev=955391&view=rev Log: [UIMA-1813] removing non-working aggregate-parent-pom. new one in separate project called aggregate-parent-pom. Removed: uima/build/trunk/parent-poms/pom.xml
svn commit: r955390 - in /uima/build/trunk/aggregate-parent-poms: ./ pom.xml
Author: schor Date: Wed Jun 16 21:14:09 2010 New Revision: 955390 URL: http://svn.apache.org/viewvc?rev=955390&view=rev Log: [UIMA-1813] Added: uima/build/trunk/aggregate-parent-poms/pom.xml Modified: uima/build/trunk/aggregate-parent-poms/ (props changed) Propchange: uima/build/trunk/aggregate-parent-poms/ -- --- svn:ignore (added) +++ svn:ignore Wed Jun 16 21:14:09 2010 @@ -0,0 +1,2 @@ +target +.project Added: uima/build/trunk/aggregate-parent-poms/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/aggregate-parent-poms/pom.xml?rev=955390&view=auto == --- uima/build/trunk/aggregate-parent-poms/pom.xml (added) +++ uima/build/trunk/aggregate-parent-poms/pom.xml Wed Jun 16 21:14:09 2010 @@ -0,0 +1,83 @@ + + + +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";> + 4.0.0 + + +org.apache.uima +parent-pom-top +1 + + + + aggregate-parent-poms + pom + 1-SNAPSHOT + UIMA Aggregate: ${project.artifactId} + This aggregates all the parent poms for convenience + ${uimaWebsiteUrl} + + + + + scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject} + + + scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject} + + + http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject} + + + + +uimaj +${project.artifactId} + + + + + + ../parent-poms/parent-pom-docbook +../parent-poms/parent-pom-ibm-notice +../parent-poms/parent-pom-eclipse-plugins + ../parent-poms/parent-pom-eclipse-plugins-ibm-notice +../parent-poms/parent-pom-distr + + +../parent-poms/parent-pom-annotator +../parent-poms/parent-pom-single-project +../uima-assembly-single-project +../uima-build-helper-maven-plugin + +../uima-docbook-resource-bundle +../uima-jar-resource-bundle + + \ No newline at end of file
svn commit: r955387 - /uima/build/trunk/aggregate-parent-poms/
Author: schor Date: Wed Jun 16 21:13:31 2010 New Revision: 955387 URL: http://svn.apache.org/viewvc?rev=955387&view=rev Log: [UIMA-1813] create separate project aggregate-parent-poms Added: uima/build/trunk/aggregate-parent-poms/
svn commit: r955376 - in /uima/site/trunk/uima-website/docs: building-uima.html distribution.html one-time-setup.html svn.html
Author: schor Date: Wed Jun 16 20:47:05 2010 New Revision: 955376 URL: http://svn.apache.org/viewvc?rev=955376&view=rev Log: [UIMA-1810 UIMA-1811] web site updates for new build, update onetime setup instructions Modified: uima/site/trunk/uima-website/docs/building-uima.html uima/site/trunk/uima-website/docs/distribution.html uima/site/trunk/uima-website/docs/one-time-setup.html uima/site/trunk/uima-website/docs/svn.html Modified: uima/site/trunk/uima-website/docs/building-uima.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/building-uima.html?rev=955376&r1=955375&r2=955376&view=diff == --- uima/site/trunk/uima-website/docs/building-uima.html (original) +++ uima/site/trunk/uima-website/docs/building-uima.html Wed Jun 16 20:47:05 2010 @@ -185,24 +185,24 @@ - SVN: Click here to see the one-time SVN setup. + SVN: Click here for the one-time SVN setup. - Maven: Click here to see the one-time Maven 3.0 setup. + Maven: Click here for the one-time Maven 3.0 setup. - Eclipse: Click here to see the one-time Eclipse setup. This includes + Eclipse: Click here for the one-time Eclipse setup. This includes setting up m2eclipse plugin (including a patch), and is only needed if you are using Eclipse as your IDE. - Docbkx: Click here to see the one-time Docbkx setup. This involves + Docbkx: Click here for the one-time Docbkx setup. This involves applying a 1-line patch (required). - + @@ -228,10 +228,15 @@ This will build that one project and install it to your local Maven repository. + +This should build all of the jars, any docbooks, and run the unit tests. +The output artifacts (Jars, html and pdf documents, etc.) are placed in each project's "target" directory, and +also are put into your local Maven repository. Docbook output is placed in the target/site/d directory. + - + @@ -268,7 +273,7 @@ - + @@ -282,12 +287,61 @@ Checkout one or many projects, as above, into some location. Then use - Eclipse menu: File ? import ? Maven ? Existing Maven projects + Eclipse menu: File -> Import -> Maven -> Existing Maven projects to import those projects into the Eclipse workspace and set them up for Maven building. To run maven commands on a project, select the project, right click, and pick Run as and then select mvn install (or other choice as you wish). +If your Maven build generates sources (e.g., you have some XMLBeans defined), +then after the initial import and project build, you'll need to use the m2eclipse command +Update Project Configuration found on the Maven context menu obtained by right-clicking the project folder. + + + + + + + + + +Checking Out Code using Eclipse + + + + + +To access the SVN repository from Eclipse, use Maven's m2eclipse plugin + and the Subclipse plugin. + +The individual projects can be checked out without worrying about relative path + dependencies, except for a few projects that refer to other projects using relative addresses. + Currently, the projects which do that are + +the aggregator projects - those special maven projects + that only serve to aggregate build operations for a set of other projects, and +the "distribution" projects - those that build entire distributions. + +The recommended way to check out many projects at once is to use the command line + (non-Eclipse) svn checkout + command. Use this to check out entire sets of projects under one of the trunks, for instance. + Once they are checked out, you can import them into an Eclipse workspace using the + File -> Import -> Maven -> Existing Maven Projects. + +You can also
svn commit: r955375 - in /uima/site/trunk/uima-website/xdocs: building-uima.xml distribution.xml one-time-setup.xml svn.xml
Author: schor Date: Wed Jun 16 20:46:09 2010 New Revision: 955375 URL: http://svn.apache.org/viewvc?rev=955375&view=rev Log: [UIMA-1810 UIMA-1811] web site updates for new build, update onetime setup instructions Modified: uima/site/trunk/uima-website/xdocs/building-uima.xml uima/site/trunk/uima-website/xdocs/distribution.xml uima/site/trunk/uima-website/xdocs/one-time-setup.xml uima/site/trunk/uima-website/xdocs/svn.xml Modified: uima/site/trunk/uima-website/xdocs/building-uima.xml URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/building-uima.xml?rev=955375&r1=955374&r2=955375&view=diff == --- uima/site/trunk/uima-website/xdocs/building-uima.xml (original) +++ uima/site/trunk/uima-website/xdocs/building-uima.xml Wed Jun 16 20:46:09 2010 @@ -1,8 +1,4 @@ -" > - -]> + @@ -76,6 +77,8 @@ If you're new to Subversion, you can che http://svnbook.red-bean.com/"; target="_blank">online book about Subversion. +See SVN setup for details on how to setup SVN. + The code for UIMA is stored in several sections: @@ -166,53 +169,10 @@ via HTTPS, in order to be able to check % svn checkout \ https://svn.apache.org/repos/asf/uima/uimaj/trunk - + - -To access the SVN repository from Eclipse, please use Maven's m2eclipse plugin - from http://m2eclipse.sonatype.org/sites/m2e";> -http://m2eclipse.sonatype.org/sites/m2e, and - the Subclispe plugin from -http://subclipse.tigris.org/update_1.0.x";> -http://subclipse.tigris.org/update_1.0.x. - - -Note that m2eclipse comes with a bundled version of maven 3 included. If that version is < 3.0.0-beta-1, - please obtain the latest maven 3 build, install it, and then use the preferences for Eclipse Maven to tell - it to use the later maven 3 build for running builds. - -The individual projects can be checked out without worrying about relative path - dependencies, except for a few projects that refer to other projects using relative addresses. - Currently, the projects which do that are - -the aggregator projects - those special maven projects - that only serve to aggregate build operations for a set of other projects, and -the "distribution" projects - those that build entire distributions. - - -The recommended way to check out many projects at once is to use the command line (non-Eclipse) svn checkout - command. Use this to check out entire sets of projects under one of the trunks, for instance. - Once they are checked out, you can import them into an Eclipse workspace using the - File -> Import -> Maven -> Existing Maven Projects. - - -You can also check out individual projects using - - Bring up the "SVN Repositories" View (from Window -> Show View -> Other) - Right click in the SVN Repositories View and select New -> Repository Location. - Enter the URL http://svn.apache.org/repos/asf/uima/uimaj/trunk (or https://...) - Shift-click to multi-select the projects you want, right click and choose "Checkout as Maven Projects" - Select "Check out into the workspace as projects" and click "Finish" - - - - - If you check out projects individually, m2eclipse may put them into individual subfolders, causing the - distribution and aggregation projects to no longer have the right relative directory specifications. - If this happens, the best thing to do is to re-checkout the entire set of related items in one go. - +See Building UIMA - checkout using Eclipse. - @@ -224,7 +184,7 @@ with the developer community. If there i create a patch and attach it to the JIRA issue. -To create a patch, use the Eclipse Team -> Create Patch command +To create a patch, use the Eclipse Team -> Create Patch command select the project in the Package Explorer, right click it to find the Team menu in the context menu). Or, use the command line and execute the svn diff command. This creates a patch that @@ -249,7 +209,7 @@ password once you become a committer. Once your password is set, you can commit from Eclipse using the -Team -> commit context menu. You can do this on an individual file, +Team -> commit context menu. You can do this on an individual file, a set of files or directories (multi-select), or on whole project(s). You can also commit from the command line like this: @@ -288,11 +248,10 @@ http://jira.atlassian.com/browse/SVN-37< - + + -Apache UIMA uses Maven 2 or 3 to do builds. Release 2.2.x of Maven, or later, is required. -Download Maven from http://maven.apache.org";> -http://maven.apache.org and add/bin to your path. + See Building UIMA. @@ -301,48 +260,23 @@ http://maven.apache.org and add < you can use the source version of the release artifact you download from the download page. - - - - - These instr