/[Apache-SVN]/beehive/trunk/build.xml
ViewVC logotype

Log of /beehive/trunk/build.xml

Parent Directory Parent Directory | Revision Log Revision Log


Links to HEAD: (view) (annotate)
Sticky Revision:

Revision 543378 - (view) (annotate) - [select for diffs]
Modified Fri Jun 1 03:28:50 2007 UTC (2 years, 5 months ago) by ekoneil
File length: 15627 byte(s)
Diff to previous 428449 (colored)
Commit some outstanding changes that simplify the build/ directory and simplify cutting a release.  In general, this flattens the build/ directory so that it's easier to navigate and deal with.

Additionally, this removes a layer of directories from docs/.

Test: distribution tests pass


Revision 428449 - (view) (annotate) - [select for diffs]
Modified Thu Aug 3 16:50:23 2006 UTC (3 years, 3 months ago) by cschoett
File length: 15635 byte(s)
Diff to previous 410529 (colored)
Updated Apache source headers for top-level files / samples /docs.

Revision 410529 - (view) (annotate) - [select for diffs]
Modified Wed May 31 14:00:41 2006 UTC (3 years, 5 months ago) by ekoneil
File length: 15451 byte(s)
Diff to previous 391168 (colored)
Move WSM from trunk/wsm to wsm/trunk.  Adds the wsm/branches and wsm/tags directories as well.  

This change also includes changes needed to make the web service control work correctly including a snapshot of WSM and a fork of some previously shared source files.

Note, WSM *does not* build yet; I'll do that work over the next few days.

BB: self
Test: Beehive trunk/ pass


Revision 391168 - (view) (annotate) - [select for diffs]
Modified Mon Apr 3 22:57:52 2006 UTC (3 years, 7 months ago) by ekoneil
File length: 15837 byte(s)
Diff to previous 380146 (colored)
Fixup an Ant property in the Maven2 support that was marked as a "location" and should be a "value".  Add a top-level target for deploying a built Beehive release into a local Maven2 repository.

BB: self
Test: none


Revision 380146 - (view) (annotate) - [select for diffs]
Modified Thu Feb 23 15:59:14 2006 UTC (3 years, 9 months ago) by ekoneil
File length: 15525 byte(s)
Diff to previous 331865 (colored)
Switch from referencing the JSR-173 API bundle on "workshop.bea.com" to referencing it from the Maven repository in ibiblio.  The license contained therein is an ASF 2.0 license, which is compatible with the repo, etc.  We should even be able to commit this to SVN, but I'd rather start downloading dependencies from ibiblio when we've got the opportunity to do so.

BB: self
Test: build works


Revision 331865 - (view) (annotate) - [select for diffs]
Modified Tue Nov 8 19:07:01 2005 UTC (4 years ago) by ekoneil
File length: 15529 byte(s)
Diff to previous 290011 (colored)
Simplification -- remove unused Ant files.  Trying to get to a point where it's easy to create a new NetUI webapp from SVN.

BB: self
Test: Beehive DRT + build.dist pass


Revision 290011 - (view) (annotate) - [select for diffs]
Modified Sun Sep 18 23:37:09 2005 UTC (4 years, 2 months ago) by ekoneil
File length: 15001 byte(s)
Diff to previous 280436 (colored)
Fix the "check.setup" target to deal correctly with the new JSR 173 bundle.

BB: self
Test: well, "check.setup" works


Revision 280436 - (view) (annotate) - [select for diffs]
Modified Mon Sep 12 22:58:56 2005 UTC (4 years, 2 months ago) by ekoneil
File length: 15004 byte(s)
Diff to previous 279604 (colored)
Move the beehive/trunk/docs/forrest/site sub-directory to beehive/site so that the website can be versioned independently from the release documentation.

BB: self
Test: clean / deploy / build.dist pass / build site pass


Revision 279604 - (view) (annotate) - [select for diffs]
Modified Thu Sep 8 19:43:46 2005 UTC (4 years, 2 months ago) by ekoneil
File length: 15096 byte(s)
Diff to previous 240379 (colored)
Fixup the JSR 173 API download that is fetched from http://workshop.bea.com/xmlbeans.  This is needed to get a JSR 173 package that is licensed correctly such that it can be shipped as part of an Apache project.  

BB: self
Test: Beehive DRT pass


Revision 240379 - (view) (annotate) - [select for diffs]
Modified Sat Aug 27 02:42:16 2005 UTC (4 years, 3 months ago) by ekoneil
File length: 14994 byte(s)
Diff to previous 232931 (colored)
Fixes to the Beehive Javadoc generation:

- canonicalize the window and doc titles to "Beehive xyz API Documentation (Version 123)"
- add version numbers to the above
- change the NetUI API documentation from "Page Flow"
- change the NetUI tag-ref documentation from "Page Flow"
- add a "build.release.docs" target to trunk/build.xml which makes it easier to chain together a set of targets that bulids the doc which would be published to the Beehvie website

BB: self
DRT: build.dist pass


Revision 232931 - (view) (annotate) - [select for diffs]
Modified Tue Aug 16 04:08:11 2005 UTC (4 years, 3 months ago) by ekoneil
File length: 14881 byte(s)
Diff to previous 230614 (colored)
Add "no.network" option to the "revision.label" target.  This is quite convenient when working on a plane without a network.

To use, run:

  ant <targets> -Dno.network=true

BB: self
DRT: Beehive pass


Revision 230614 - (view) (annotate) - [select for diffs]
Modified Sun Aug 7 00:42:15 2005 UTC (4 years, 3 months ago) by ekoneil
File length: 14862 byte(s)
Diff to previous 230377 (colored)
Add a copy of the live Beehive website to Subversion.

This should make it significantly easier to add content to / update the website.  Instructions are included in the docs/updating_livesite.txt file.

BB: self
DRT: Beehive / build.dist pass


Revision 230377 - (view) (annotate) - [select for diffs]
Modified Fri Aug 5 00:59:28 2005 UTC (4 years, 3 months ago) by bayard
File length: 14862 byte(s)
Diff to previous 227511 (colored)
moving to TLP

Revision 227511 - (view) (annotate) - [select for diffs]
Modified Thu Aug 4 22:44:11 2005 UTC (4 years, 3 months ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 14862 byte(s)
Diff to previous 227458 (colored)
Fixup the Forrest version in trunk/build.xml.

Krista noticed that this was still set to 0.6.

BB: self
DRT: none


Revision 227458 - (view) (annotate) - [select for diffs]
Modified Thu Aug 4 19:46:13 2005 UTC (4 years, 3 months ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 14871 byte(s)
Diff to previous 225148 (colored)
Separate the site/ and release/ documentation.

This has been done by branching the docs in forrest/ into two sub-directories:

  release/
  site/

The former contains the documentation for the release that is currently maintained in the given source line (trunk/, in this case) and site/ contains Beehive's Apache website.  

This is currently a little funky as the tabs on the release documentation and site contents are different, but they share the same look and feel and should be easily evolvable over time.  Also, there are some *hard* references from the site/ docs into the release/ docs that are done by URL as http://incubator.apache.og/beehive.  This needs to be fixed going forward, but it's a much easier problem to handle than the current one of having two release doc kits on the stie at once.  :)

Haven't published this new site yet -- will probably wait to do that until the infra folks have setup beehive.apache.org.

Also, this changes the documentation that's included in the distribution -- it's now just the docs for a specifc release as opposed to the entire Beehive website.

BB: self
DRT: Beehive / build.dist pass


Revision 225148 - (view) (annotate) - [select for diffs]
Modified Mon Jul 25 16:12:55 2005 UTC (4 years, 4 months ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 14866 byte(s)
Diff to previous 170465 (colored)
Missed this file in the last doc infrastructure checkin.

BB: self
DRT: build.dist pass


Revision 170465 - (view) (annotate) - [select for diffs]
Modified Mon May 16 21:47:31 2005 UTC (4 years, 6 months ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 14866 byte(s)
Diff to previous 169648 (colored)
Fix JIRA 741.

BB: self
DRT: none


Revision 169648 - (view) (annotate) - [select for diffs]
Modified Wed May 11 15:39:23 2005 UTC (4 years, 6 months ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 14838 byte(s)
Diff to previous 169647 (colored)
Start deleting the trunk/controlhaus/ directory as the controlhaus files are no longer needed in the Beehive tree.

BB: self
DRT: none


Revision 169647 - (view) (annotate) - [select for diffs]
Modified Wed May 11 15:35:39 2005 UTC (4 years, 6 months ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 14847 byte(s)
Diff to previous 169499 (colored)
Add a build file for the samples.  This addresses two problems:

- the distribution occasionally contains files generated by building the samples (.class files and such)
- we need a way to verify that the samples do build before spinning a distribution

This isn't wired into the main "build.dist" target, but it will be shortly.

BB: self
DRT: none, but the samples build


Revision 169499 - (view) (annotate) - [select for diffs]
Modified Tue May 10 17:22:28 2005 UTC (4 years, 6 months ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 14467 byte(s)
Diff to previous 169392 (colored)
Various bug fixes:

JIRA 636 -- add source headers to files missing them in the distribution (JSPs, tag files, Java)
JIRA 616 -- move the /error.jsp page from the root of a NetUI-enabled webapp to /resources/beehive/version1/jsps/error.jsp.  This is really a framework JSP that uses NetUI provided images and styles.  To use your own error.jsp, just replace references to the previous path with a path to your error.jsp
JIRA 640 -- fixup the path to build.properties in the petstoreWeb webapp

BB: self
DRT: Beehive pass


Revision 169392 - (view) (annotate) - [select for diffs]
Modified Tue May 10 01:21:48 2005 UTC (4 years, 6 months ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 13834 byte(s)
Diff to previous 169390 (colored)
Disable the deletion of the controlhaus/ directory to give people a day's notice before the directory goes away.

BB: self
DRT: none


Revision 169390 - (view) (annotate) - [select for diffs]
Modified Tue May 10 01:13:27 2005 UTC (4 years, 6 months ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 13825 byte(s)
Diff to previous 158486 (colored)
Enable the system control build out of Beehive.  

The sync from svn.controlhaus.org is now disabled and the local ./controlhaus directory is deleted during an "ant clean" from the top level.

The controls are now put into the distribution under:

  <dist-dir>/lib/controls/
                       beehive-ejb-control.jar
                       beehive-jms-control.jar
                       beehive-jdbc-control.jar
                       beehive-webservice-control.jar

All references haev been changed to the "org.controlhaus" package.

Three steps are left to finish this work:
- checkin the Forrest documentation that was created from the controlhaus.org websites for the four system controls
- checkin the system control samples; these will live in system-controls/samples for the time being until they're "Beehive-ized" and moved into /samples
- fixup the Beehive documentation to fix the *.controlhaus.org links so that they're referencing the Beehive system control documentation

BB: self
DRT: Beehive pass / test.dist pass


Revision 158486 - (view) (annotate) - [select for diffs]
Modified Mon Mar 21 17:31:20 2005 UTC (4 years, 8 months ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 13030 byte(s)
Diff to previous 157286 (colored)
Contribution from Jim Cummings to add targets for building the test distribution, running the tests against a distribution, etc.

BB: self
DRT: Beehive pass
Test: test.dist passes


Revision 157286 - (view) (annotate) - [select for diffs]
Modified Sat Mar 12 21:52:52 2005 UTC (4 years, 8 months ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 11636 byte(s)
Diff to previous 156561 (colored)
Rename buildWebappCore.xml to beehive-tools.xml.  This adds a .properties file for the distribution that defines various resources needed to build a webapp including the JSP and Servlet APIs.

Removes some unused shell scripts and an old beehive.properties file that should have been deleted a while ago.

The NetUI-enabled webapps in the distribution now are structured as:

  WEB-INF/src/
              build.xml
              build.properties

where build.properties defines beehive.home.  Then, the build.xml file simply imports the beehive-imports.xml file to obtain the <path>s defined there and beehive-tools.xml to define the tools used to build JPFs, controls, and XSDs.  

BB: self
DRT: Beehive pass
BVT: NetUI pass
Tests: distribution tests pass


Revision 156561 - (view) (annotate) - [select for diffs]
Modified Tue Mar 8 19:49:30 2005 UTC (4 years, 8 months ago) by bryanche
Original Path: incubator/beehive/trunk/build.xml
File length: 11761 byte(s)
Diff to previous 156113 (colored)
Enable Beeive DRT and other tests to run with app servers besides just
Tomcat.  Also, fixes a bug in
controls/test/webapps/controlsWeb/WEB-INF/web.xml.  

To run with a different app server, create a
ant/${servlet.runtime}-imports.xml file for that server and edit the
servlet.runtime property in beehive-imports.xml to point to that file.
This submit includes a jonas-imports.xml file for running beehive with
jonas.

I successfully ran the DRT and controls perf tests with these changes.

Revision 156113 - (view) (annotate) - [select for diffs]
Modified Fri Mar 4 01:06:01 2005 UTC (4 years, 8 months ago) by kentam
Original Path: incubator/beehive/trunk/build.xml
File length: 11760 byte(s)
Diff to previous 155946 (colored)
Fix controls samples build.
Make svn revision label creation optional.


Revision 155946 - (view) (annotate) - [select for diffs]
Modified Wed Mar 2 19:42:07 2005 UTC (4 years, 8 months ago) by kentam
Original Path: incubator/beehive/trunk/build.xml
File length: 11731 byte(s)
Diff to previous 155753 (colored)
BEEHIVE-349: Beehive build and distributions should include svn revision #s

svn.rev in the root of the distribution contains the Beehive svn rev # that the distro was built at.
lib/controls/controlhaus.rev contains the Controlhaus svn rev #s that the controls in the distro were built at.


Revision 155753 - (view) (annotate) - [select for diffs]
Modified Tue Mar 1 04:15:01 2005 UTC (4 years, 8 months ago) by kentam
Original Path: incubator/beehive/trunk/build.xml
File length: 11343 byte(s)
Diff to previous 155014 (colored)
BEEHIVE-86: tar.gz file probs from build.dist.archives

Delegate to an external tar program when building archives under Windows.


Revision 155014 - (view) (annotate) - [select for diffs]
Modified Wed Feb 23 14:28:08 2005 UTC (4 years, 9 months ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 11343 byte(s)
Diff to previous 154787 (colored)
Remove the test distribution shell scripts and add Ant targets to accomplish the same.

Patch contributed by Julie Zhuo.

BB: self
DRT: Beehive pass / build.dist pass


Revision 154787 - (view) (annotate) - [select for diffs]
Modified Tue Feb 22 04:38:38 2005 UTC (4 years, 9 months ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 11206 byte(s)
Diff to previous 154409 (colored)
Add a target for performing a "scrub" on the Beehive tree.

Currently, this deletes the controlhaus/ and installed/ directories.

BB: self
Test: clean deploy runs


Revision 154409 - (view) (annotate) - [select for diffs]
Modified Sat Feb 19 15:42:50 2005 UTC (4 years, 9 months ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 11033 byte(s)
Diff to previous 149410 (colored)
Cleanup some targets associated with building a distribution.

- set the library distribution name.  This was coming out as ${dist.lib.name}
- add a "build.dist.archives" target to /build.xml for easier chaining of Ant targets
- change the name of the distribution output directory from build/jars/ to build/dist/archives/.  We don't produce JARs anyway.  :)

BB: self
DRT: none.  distribution build is successful.


Revision 149410 - (view) (annotate) - [select for diffs]
Modified Tue Feb 1 15:55:44 2005 UTC (4 years, 9 months ago) by jsong
Original Path: incubator/beehive/trunk/build.xml
File length: 10474 byte(s)
Diff to previous 126621 (colored)
Update build.xml and distribution.xml to build some useful controls for controlhaus as part of the distribution.
Code contributed by Mike Foster and Jeremiah Johnson.
This update should resolve JIRA-BEEHIVE-204.

Revision 126621 - (view) (annotate) - [select for diffs]
Modified Thu Jan 27 16:14:06 2005 UTC (4 years, 10 months ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 10344 byte(s)
Diff to previous 125730 (colored)
Build spew goes on a diet.

Now only spews when there's a version mismatch, and the Ant / Java / Beehive home directories and Beehive version are now printed through "ant check.setup".

BB: self
DRT: none


Revision 125730 - (view) (annotate) - [select for diffs]
Modified Thu Jan 20 07:21:26 2005 UTC (4 years, 10 months ago) by rich
Original Path: incubator/beehive/trunk/build.xml
File length: 10180 byte(s)
Diff to previous 125577 (colored)
This is a submission from Carlin Rogers:

    "- Added the schema for the url-templates-config.xml
    - Modified the UrlTemplateDescriptor class to utilize
      new classes that utilize XMLBeans to read and parse
      a WEB-INF/url-templates-config.xml file.
    - Added a new UrlTemplate class to provide an object
      containing a parsed representation of a given url
      template found in the config file. This should
      improve performance as the old code was doing
      string parsing each time a single token was to
      be replaced with a value.
    - Resurrected the urlTemplates webapp, adding an ant
      build.xml, consistent index page flow, removing
      some obsolete files, and fixing the testRecorder
      config. Note that this test will not run correctly
      unless configured with a ServerAdapter that
      returns the correct SecurityProtocol value for a
      given URL. (ToDo: need to update the
      DefaultServerAdapter to parse the web.xml and
      return the correct SecurityProtocol based on
      security-constraint elements)
    - cleaned up some of the tiles test jsp files.
    - other minor clean up (typos, etc.)"

Thanks Carlin!

DRT/BVT: netui (WinXP)
BB: self (linux)


Revision 125577 - (view) (annotate) - [select for diffs]
Modified Wed Jan 19 01:31:03 2005 UTC (4 years, 10 months ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 10179 byte(s)
Diff to previous 125553 (colored)
Slight doc tweaks based on feedback from Kyle.

- "check.setup" now checks for JSR 173
- add comment to BUILDING.txt about execute permissions and fix misspelling

BB: self
DRT: none


Revision 125553 - (view) (annotate) - [select for diffs]
Modified Tue Jan 18 22:07:13 2005 UTC (4 years, 10 months ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 9735 byte(s)
Diff to previous 125548 (colored)
Little more cleanup.

- remove the Ant / Tomcat installers from SVN
- print the classpath used when compiling XMLBeans (useful for debugging compilation failures)
- break "clean"'s dependence with bootstrap
  - yes, you still need to run bootstrap
- update BUILDING.txt with "bootstrap" instructions

BB: self


Revision 125548 - (view) (annotate) - [select for diffs]
Modified Tue Jan 18 21:22:04 2005 UTC (4 years, 10 months ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 9811 byte(s)
Diff to previous 125545 (colored)
Fixup JSR 173 downloads given last set of changes.

BB: self
DRT: running now :)



Revision 125545 - (view) (annotate) - [select for diffs]
Modified Tue Jan 18 21:02:36 2005 UTC (4 years, 10 months ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 9817 byte(s)
Diff to previous 123589 (colored)
Significant rework of the Beehive build.

The BUILDING.txt file has the best description of how to setup a new build environment.

Major changes:
- remove Ant from the build
- remove Tomcat from the build
  - note, this is still required as it's the default Servlet container, but Beehive doesn't install this
- remove the BEEHIVE_HOME environment variables from the SVN and distribution builds
- remove all *.cmd / *.sh scripts for initializing an environment from the SVN and distribution builds
- remove the beehive.properties file and change to the Ant <import> model that Bob proposed.  Paths and filesets are now defined at the top-level and shared among all sub-projects.
- move Ant used for testing from test/ant to /ant.  This puts the webapp build files in the same place as the distribution and makes it easier to target an application against either SVN or a distribution.
- no longer force copying of junit.jar to $ANT_HOME/lib
  - this is now an install step
- no longer force copying tomcat-users.xml to $CATALINA_HOME/conf
  - this is now an install step
- remove isJDKOver5 checks from nested builds.  this is a requirement for Beehive.
- implement Java / Ant version checking in /beehive-imports.xml
- move the definition of an XMLBean schema task from sub-projects to beehive-imports.xml
- start isolating WS / app container dependencies in:
    ant/axis-imports.xml
    ant/tomcat-imports.xml
    These files expose <target>s that are referenced in Ant macros defined in beehive-imports.xml.  To plug-in a new server, implement one of these files and change the correct "webservice.runtime" or "servlet.runtime" property in beehive-imports.xml
- switch NetUI coreWeb tests off of using explicitly registered Struts TLDs to using the ones in struts.jar
- move the targets for building a distribution into distribution.xml 
- update BUILDING.txt

What's broken / undone:
- running the controls performance tests
- re-wiring the builds for all of the code in samples/.  The Ant build file shipped in the distribution need work before 
the next ship date, and these can be fixed as the distribution builds shake out.
- running the JSF tests for NetUI
- removing Axis from the samples.  Seems that this should be like Tomcat -- something that the user installs and Beehive references.

I'm sure that there are other things that aren't completed or wired up, but hopefully with this checked in, others can pitch-in and help make all of this better.

If you've got an existing Beehive build environment, you'll need to make the following changes:

1) install Tomcat 5.0.x and set CATALINA_HOME in your shell
2) install Ant 1.6.2 and set ANT_HOME in your shell
3) copy trunk/external/junit/junit.jar to $ANT_HOME/lib
4) ensure that the following is defined in $CATALINA_HOME/conf/tomcat-users.xml
  
    <user username="manager" password="manager" roles="manager"/>

5) ensure your PATH contains $JAVA_HOME/bin:$ANT_HOME/bin

To test your install, run:

  ant check.setup

BB: self
Tests: Beehive DRT, build.dist / test.dist / NetUI dist test


Revision 123589 - (view) (annotate) - [select for diffs]
Modified Wed Dec 29 02:51:47 2004 UTC (4 years, 10 months ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 21575 byte(s)
Diff to previous 122859 (colored)
Commit a patch for JIRA 102.  This patch is a contribution by Bryan Che and adds support for JOnAS.

This patches the distribution, but there are still issues with running the SVN tree against various servers.  More comments / thoughts in the JIRA bug.

BB: self
DRT: Beehive pass


Revision 122859 - (view) (annotate) - [select for diffs]
Modified Mon Dec 20 16:31:45 2004 UTC (4 years, 11 months ago) by kylem
Original Path: incubator/beehive/trunk/build.xml
File length: 21505 byte(s)
Diff to previous 111899 (colored)
Resolved BEEHIVE-143 (ant test.dist should support linux/unix) by applying patch submitted by Bryan Che

Revision 111899 - (view) (annotate) - [select for diffs]
Modified Tue Dec 14 23:05:47 2004 UTC (4 years, 11 months ago) by steveh
Original Path: incubator/beehive/trunk/build.xml
File length: 21193 byte(s)
Diff to previous 111885 (colored)
Part of the fix for BEEHIVE-28: Clean up docs build

The 'trunk/build.xml>ant build.dist.docs.jar' target now jars up only the trunk/build/dist/docs directory, not the entire trunk/build/dist directory.

Revision 111885 - (view) (annotate) - [select for diffs]
Modified Tue Dec 14 22:03:29 2004 UTC (4 years, 11 months ago) by dolander
Original Path: incubator/beehive/trunk/build.xml
File length: 21188 byte(s)
Diff to previous 111765 (colored)
Contributor: Brian Che

This is a modification of the contribution from Brian Che that switched to using the 
commons-codec URLCodec from the java.net.URLEncoder/Decoder.

Instead of introducing a new model and .jar file into netui, I backed out the changes to the
scoping module to avoid the circular dependency and put the code into the util.jar.  

I did this, so that the code could eventual be moved into a beehive common .jar 
file (which doesn't currently exist).  In the mean time, I will assign the issue 
to Rich to resolve some issues with Scoping and why it proceeds the util.jar.
We need to resolve how these need two jars releate to each other and with an eventual 
common jar file for all of beehive.



Revision 111765 - (view) (annotate) - [select for diffs]
Modified Mon Dec 13 23:54:54 2004 UTC (4 years, 11 months ago) by stocco
Original Path: incubator/beehive/trunk/build.xml
File length: 21137 byte(s)
Diff to previous 111549 (colored)
This change was submitted by Julie Zhuo.

Code Reviewed by Eddie O'Neil and Steve Tocco

This adds the ability to test NetUI tests against the distribution in a very decoupled fashion as the tests are bundled and can be run external from the SVN tree.

This will hopefully lead to a unified model to test all aspects against the distribution (controls, jws), but that may be a while.

The readme for using this is located in
netui/test/dist-test

To build the test package, launch build.test.dist at the trunk.

Revision 111549 - (view) (annotate) - [select for diffs]
Modified Fri Dec 10 21:36:25 2004 UTC (4 years, 11 months ago) by steveh
Original Path: incubator/beehive/trunk/build.xml
File length: 20520 byte(s)
Diff to previous 111542 (colored)
'unless' should be 'if'!
(*If* Forrest is present, then build the docs.)

Revision 111542 - (view) (annotate) - [select for diffs]
Modified Fri Dec 10 19:44:51 2004 UTC (4 years, 11 months ago) by jsong
Original Path: incubator/beehive/trunk/build.xml
File length: 20523 byte(s)
Diff to previous 111462 (colored)
Re-activate build.dist.doc after intalling Forrest.

Revision 111462 - (view) (annotate) - [select for diffs]
Modified Fri Dec 10 03:26:52 2004 UTC (4 years, 11 months ago) by jsong
Original Path: incubator/beehive/trunk/build.xml
File length: 20528 byte(s)
Diff to previous 111449 (colored)
Temporarily disable doc build until forrest is installed correctly.

Revision 111449 - (view) (annotate) - [select for diffs]
Modified Fri Dec 10 00:09:16 2004 UTC (4 years, 11 months ago) by steveh
Original Path: incubator/beehive/trunk/build.xml
File length: 20523 byte(s)
Diff to previous 111439 (colored)
Making the Forrest installation a manual process.
Building.txt has been amended with new instructions for installing Forrest.
build.xml now checks for a FORREST_HOME before running docs-related targets.

DRTs passed.

Revision 111439 - (view) (annotate) - [select for diffs]
Modified Thu Dec 9 22:05:02 2004 UTC (4 years, 11 months ago) by steveh
Original Path: incubator/beehive/trunk/build.xml
File length: 21438 byte(s)
Diff to previous 111151 (colored)
Changing references to "reference" to "apidocs".
(This change makes the Forrest build cleaner and more error tolerant, since Forrest skips validation of paths which include the string "apidocs".)
 
DRT passed.

Revision 111151 - (view) (annotate) - [select for diffs]
Modified Tue Dec 7 22:07:49 2004 UTC (4 years, 11 months ago) by steveh
Original Path: incubator/beehive/trunk/build.xml
File length: 21866 byte(s)
Diff to previous 95175 (colored)
beehiveEnv.cmd/.sh: new environmental variables related to the Forrest docs.
build.xml: new build targets ("bootstrap" and "docs") related to Forrest docs.

Revision 95175 - (view) (annotate) - [select for diffs]
Modified Fri Nov 19 01:06:24 2004 UTC (5 years ago) by kentam
Original Path: incubator/beehive/trunk/build.xml
File length: 20280 byte(s)
Diff to previous 56720 (colored)
Merging v1/alpha DB control changes to trunk

Contributor: Hoi Lam



Revision 56720 - (view) (annotate) - [select for diffs]
Modified Sat Nov 6 01:31:13 2004 UTC (5 years ago) by mmerz
Original Path: incubator/beehive/trunk/build.xml
File length: 19521 byte(s)
Diff to previous 55915 (colored)
Merged build for WSM samples from alpha branch back into trunk.
Note: the EmployeeWS is not yet functional because it depends on dbControl.jar, which will be put into WEB-INF by controls-db once controls-db has been merged back into trunk.


Revision 55915 - (view) (annotate) - [select for diffs]
Modified Fri Oct 29 00:06:22 2004 UTC (5 years, 1 month ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 18589 byte(s)
Diff to previous 55749 (colored)
Fixes:

- set a default value for beehive.version in beehive.properties.  This will set the name of the built distribution to:

  apache-beehive-incubating-svn-snapshot

instead of:

  apache-beehive-incubating-alpha-${beehive.version}

This value can be overridden as needed on the command line as:

  ant build.dist -Dbeehive.version=foo

Since this line has branched, it seems reasonable to set the value in the beehive.properties file.

- fix the "build.dist test.dist" sequence.  This is broken when the .zip/.tar.gz files aren't created because the output of the test run is written to jars/

BB: self
Test: build.dist test.dist passes 


Revision 55749 - (view) (annotate) - [select for diffs]
Modified Wed Oct 27 23:44:53 2004 UTC (5 years, 1 month ago) by mmerz
Original Path: incubator/beehive/trunk/build.xml
File length: 18500 byte(s)
Diff to previous 55746 (colored)
Deleted schematypes.jar since it contained classes already in apache-xbean.jar.

Now copying jars from wsm/lib/ into the distribution.

Contributor: Jonathan Colwell


Revision 55746 - (view) (annotate) - [select for diffs]
Modified Wed Oct 27 23:03:22 2004 UTC (5 years, 1 month ago) by kentam
Original Path: incubator/beehive/trunk/build.xml
File length: 18424 byte(s)
Diff to previous 55739 (colored)
Adding a blank controls template app.  This makes it easy to build controls -- just copy this template, author controls in it and run "ant build" to produce a JAR with your controls that can be used elsewhere.


Revision 55739 - (view) (annotate) - [select for diffs]
Modified Wed Oct 27 21:08:35 2004 UTC (5 years, 1 month ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 18167 byte(s)
Diff to previous 55669 (colored)
Build work to:

- break the build dependency on the presence of a Tomcat installation
- remove the log4j .zip file and replace with the log4j JAR file

This will help in building Beehive and then runing the tests on any container.

BB: self
DRT: Beehive pass


Revision 55669 - (view) (annotate) - [select for diffs]
Modified Wed Oct 27 04:32:45 2004 UTC (5 years, 1 month ago) by kentam
Original Path: incubator/beehive/trunk/build.xml
File length: 19164 byte(s)
Diff to previous 55564 (colored)
Tune distribution build:

1) Produce both .zip and .tar.gz archives
2) Distributions are now named using the scheme "apache-beehive-incubating-alpha-${beehive.version}"
3) Distro structure is contained in a top-level dir with the same name.
4) Including license and IP notice.

build.dist.jar is gone.

Relevant targets are now:

build.dist.zip: builds the zip distro
build.dist.tgz: builds the tgz distro
build.dist.archives: builds both zip & tgz distros


Revision 55564 - (view) (annotate) - [select for diffs]
Modified Tue Oct 26 03:45:06 2004 UTC (5 years, 1 month ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 18183 byte(s)
Diff to previous 55561 (colored)
Changes related to velocitydep:

- ensure that the JAR is copied into the distribution
- add a property to the distribution's beehive.properties file

BB: self
DRT: Beehive pass
Test: build.dist test.dist pass


Revision 55561 - (view) (annotate) - [select for diffs]
Modified Tue Oct 26 03:09:45 2004 UTC (5 years, 1 month ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 18183 byte(s)
Diff to previous 55547 (colored)
Fixes to previous checkin reated to the relationship between the dev and distribution builds.

- remove the user/buildWebapp.xml file; this functionality is now provided by test/ant/buildWebapp.xml
- re-jigger the Tomcat deploy / undeploy functionality to be available via buildWebapp.xml

BB: self
DRT: Beehive pass
Tests: build.dist test.dist


Revision 55547 - (view) (annotate) - [select for diffs]
Modified Tue Oct 26 00:35:49 2004 UTC (5 years, 1 month ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 18179 byte(s)
Diff to previous 55542 (colored)
Apparently not ready to require beehive.version yet.



Revision 55542 - (view) (annotate) - [select for diffs]
Modified Tue Oct 26 00:14:25 2004 UTC (5 years, 1 month ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 18163 byte(s)
Diff to previous 55518 (colored)
Build fixup for ApacheCon and the release tomorrow.

This makes a bit of a mess of things.  My apologies in advance.  <g>  

Ken and I are working on getting a basic distribution rolling that is:

- not huge
- testable

The former goal is accomplished by *not* including any built webapps / templates at this time.  In order to support development of the webapps, there is a target in ant/buildWebapp.xml that will deploy a Beehive webapp runtime given a webapp.dir.

The latter goal is accomplished using the "testDistro" script which attempts to build the webapps that are deployed into the distribution.

In addition, there is the addition of a user/buildWebapp.xml file that is used in the distribution to support:

- webapp builds
- copying of the webapp runtime
- deploy / undeploy / redeploy of apps on Tomcat

This file is similar in purpose, though different in environment, the dev-line's test/ant/buildWebapp.xml file.  These *need* to be merged in the near term, but the priority is definitely getting the distribution rolling.  The dev-line will get cleaned up shortly.

BB: self
DRT: Beehive pass
Tests: build.dist test.dist passes


Revision 55518 - (view) (annotate) - [select for diffs]
Modified Mon Oct 25 18:05:26 2004 UTC (5 years, 1 month ago) by kentam
Original Path: incubator/beehive/trunk/build.xml
File length: 18332 byte(s)
Diff to previous 55323 (colored)
Flesh out distribution build process (see http://wiki.apache.org/beehive/Distribution_20Structure?action=show).
The PetStore sample now builds using only the distribution bits, and the top-level "test.dist" target should
keep this alive.


Revision 55323 - (view) (annotate) - [select for diffs]
Modified Fri Oct 22 18:09:42 2004 UTC (5 years, 1 month ago) by steveh
Original Path: incubator/beehive/trunk/build.xml
File length: 15360 byte(s)
Diff to previous 55169 (colored)
(1) Changed the destination of the doc's index.html page.
(2) The <fixcrlf> calls now only modify the HTML files, all other file types are excluded.

Revision 55169 - (view) (annotate) - [select for diffs]
Modified Wed Oct 20 17:40:46 2004 UTC (5 years, 1 month ago) by steveh
Original Path: incubator/beehive/trunk/build.xml
File length: 15285 byte(s)
Diff to previous 55139 (colored)
The target 'build.dist' now pics up an index.html page for the Beehive docs.

Revision 55139 - (view) (annotate) - [select for diffs]
Modified Wed Oct 20 08:57:37 2004 UTC (5 years, 1 month ago) by kentam
Original Path: incubator/beehive/trunk/build.xml
File length: 15233 byte(s)
Diff to previous 54855 (colored)
Distribution build work per the spec at http://wiki.apache.org/beehive/Distribution_20Structure

The following top-level commands will build a distribution:

"ant build.dist" : builds an exploded distribution in build/dist
"ant -Dbeehive.version=0.4 build.dist.jar" : builds a distribution JAR in build/jars/

The distribution now includes javadocs, but no samples yet. 

+ some minor null vs "" tweaks in the controls compilation code.



Revision 54855 - (view) (annotate) - [select for diffs]
Modified Fri Oct 15 15:38:42 2004 UTC (5 years, 1 month ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 14412 byte(s)
Diff to previous 54700 (colored)
Additional work in getting the webapp build working for the Beehive distribution.

This incldues a build.xml file which resides in the WEB-INF/src directory of the Beehive enabled webapp template.

Slight cleanup in the runTomcatCore / buildWebappCore build files to support this including:

- change the name of the property that refers to the Tomcat root from ${tomcat.dir} to ${tomcat.home} in runTomcatCore.xml
- add a velocity.classpath to buildWebapp that is consumed by buildWebappCore and is used during controls compilation

BB: self
DRT: Beehive pass
BVT: NetUI pass


Revision 54700 - (view) (annotate) - [select for diffs]
Modified Tue Oct 12 21:41:35 2004 UTC (5 years, 1 month ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 14010 byte(s)
Diff to previous 54675 (colored)
More build updates in prep for having the build/dist directory setup.

This is really a checkpoint that's relying on a weird environment variable in the default build.xml file for a webapp; more on that in a bit.

- fix runTomcatCore.xml to break a dependence on a Beehive dev target that won't always be present
- fix webappTemplate.xml to include the correct build.xml file
- begin implementing the clean.dist / build.dist targets in /build.xml

BB: self
DRT: Beehive pass



Revision 54675 - (view) (annotate) - [select for diffs]
Modified Tue Oct 12 15:52:48 2004 UTC (5 years, 1 month ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 11602 byte(s)
Diff to previous 54631 (colored)
Build work in preparation for creating the build/dist directory.

- break runTomcat into two parts -- one that is Beehive specific and one that can be used in the distribution and contains the core tasks for starting / stopping and webapp deployment

- fixup spacing in /build.xml and add "build.dist" target (to be filled in shortly)

- fixup /build.xml to call the NetUI "docs" target as it is invoked in wsm and controls

BB: self
DRT: Beehive pass
BVT: NetUI pass



Revision 54631 - (view) (annotate) - [select for diffs]
Modified Mon Oct 11 22:56:26 2004 UTC (5 years, 1 month ago) by steveh
Original Path: incubator/beehive/trunk/build.xml
File length: 9689 byte(s)
Diff to previous 37100 (colored)
Adding new documentation targets.

Revision 37100 - (view) (annotate) - [select for diffs]
Modified Thu Aug 26 23:22:42 2004 UTC (5 years, 3 months ago) by kentam
Original Path: incubator/beehive/trunk/build.xml
File length: 9715 byte(s)
Diff to previous 36488 (colored)
Initial WSM prototype of the core as suggested in the proposal posted last week (see Beehive Wiki) that is based on Anil's posting from earlier this week.

The prototype provides a skeleton consisting of three main branches:

1) Object model

The object model is a set of classes that acts as the repository for annotation metadata.  The model is intended to be a simple Java Bean object structure organized around TYPE, METHOD and PARAMETER ElementTypes defined in JSR 181.  The corresponding classes are: WebServiceTYPEMetadata, WebServiceMEHTODMetadata, and WebServicePARAMETERMetadata.  There are one to many relationships between TYPE and METHODS, and between METHODS and PARAMETERS.

There are get/set methods for simple attributes at each ElementType (eg. wsName or the WebService Name in WebServiceTYPEMetadata).   For annotation data that requires complex structure (e.g.  SoapBinding) or when there is a one to many relationship (e.g. SOAP Message handler at WebServiceTYPEMetadata)  Info classes are used (e.g. SoapBindingInfo, or SOAPMessageHandlersInfo) to capture the metadata.   

The model can be initialized from source (using two phase APT processor) or class file (straight java 1.5 api).  In either case the metadata is processed according to the rules of the 181 and the result is stored in the object model.  The APT, or Class file processing is responsible for the declaration level validation.  The model , on the other hand  is responsible for overall validation of the meta data.  
The model is intended to be used throughout the application (ant tasks, command line applications such as Java2WSDL, Axis server etc).  The model will be enhanced to support the use cases as they become more apparent.

2) JSR-181 processor

The JSR-181 processor has an (apt) interface that can be used by IDEs, for instance. This interface works on annotated java source files and extends the TwoPhaseAnnotationProcessor (see controls subproject).
Its main methods, check() and generate() are mainly invoked by the apt (through the TwoPhaseAnnotationProcessor's process() method). The WsmAnnotationProcessorFactory currently registers only for one annotation type, @WebService. Since check() work on the entire file, all further information is derived while @WebService is being processed. [On the other hand, this means that check() does currently not perform any validation tasks if a @WebService annotation is not present.]
generate() only performs a simple print out of @WebService and all @WebMethod annotations -- for error checking (until unit tests for this module are in place). In the future, generate() will be called to generate all artifacts for a Web Service, while check() performs quick, low-cost error checks.
From the command line, the apt can be invoked with the WsmAnnotationProcessorFactory like this (assuming the current directory is the classpath root directory):
  apt -cp . -factory org.apache.beehive.wsm.runtime.processor.apt.WsmAnnotationProcessorFactory <name of annotated WebService file, e.g. <directory>/Foo.java>

3) XMLBeans

The org.apache.beehive.wsm.wsdl.WSDLProcessor provides a (hopefully!) convenient way to work with WSDL documents.  Behind the scenes, the WSDLProcessor loads a WSDL as XmlBeans and returns a DefinitionsDocument from which the entire WSDL can be examined or manipulated.  Additionally, the DefinitionsDocument can write out its internal representation back to XML with any modifications now in place.  Since the WSDL used by most web services consists of elements from both the wsdl schema (http://schemas.xmlsoap.org/wsdl/) and the wsdlsoap schema extension (http://schemas.xmlsoap.org/wsdl/soap/), the WSDLProcessor provides helper functions to navigate more eaily between the core wsdl elements and those provided by the extension.  By loading the WSDL into XmlBean generated objects, the rest of the WSM system can read and write WSDL documents with a minimum of effort and no core dependencies on a specific web services implementation.


Contributed by: Michael Merz, Jonathan Colwell, Daryoush Mehrtash, Anil Sharma


Revision 36488 - (view) (annotate) - [select for diffs]
Modified Tue Aug 17 03:37:40 2004 UTC (5 years, 3 months ago) by jsong
Original Path: incubator/beehive/trunk/build.xml
File length: 9416 byte(s)
Diff to previous 36483 (colored)
Revert the change made by revision 36483, and move the composition logic to the caller of these target.

Revision 36483 - (view) (annotate) - [select for diffs]
Modified Tue Aug 17 00:22:15 2004 UTC (5 years, 3 months ago) by jsong
Original Path: incubator/beehive/trunk/build.xml
File length: 9591 byte(s)
Diff to previous 35737 (colored)
Add a "run_all" target to trunk/build.xml, which will run "clean","deploy" and "drt".
This target provides a handle for cruisecontrol to clean, build and run both NETUI drt and control drt.

Revision 35737 - (view) (annotate) - [select for diffs]
Modified Thu Aug 5 14:55:39 2004 UTC (5 years, 3 months ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 9416 byte(s)
Diff to previous 35629 (colored)
Upgrade the internal Beehive Ant version from 1.6.1 to 1.6.2.

Included are .zip and .tar.gz files for 1.6.2.  The old ones have also been deleted.

BB: self
DRT: NetUI pass
     Controls pass


Revision 35629 - (view) (annotate) - [select for diffs]
Modified Tue Aug 3 13:37:42 2004 UTC (5 years, 3 months ago) by ias
Original Path: incubator/beehive/trunk/build.xml
File length: 9416 byte(s)
Diff to previous 23219 (colored)
Fix mistypo in ensure.jsr173 target.

Revision 23219 - (view) (annotate) - [select for diffs]
Modified Sat Jul 24 21:31:28 2004 UTC (5 years, 4 months ago) by ekoneil
Original Path: incubator/beehive/trunk/build.xml
File length: 9412 byte(s)
Diff to previous 22994 (colored)
Add proxy supprt to the build.

This can be used to setup the correct proxy information in order to download the JSR 173 support depending on your network configuration.

This was contributed by Venkat.

BB: self
DRT: pass 


Revision 22994 - (view) (annotate) - [select for diffs]
Modified Sat Jul 17 06:13:04 2004 UTC (5 years, 4 months ago) by kentam
Original Path: incubator/beehive/trunk/build.xml
File length: 7504 byte(s)
Copied from: incubator/beehive/build.xml revision 22993
Diff to previous 22985 (colored)
Reorg dir structure for branches.


Revision 22985 - (view) (annotate) - [select for diffs]
Added Sat Jul 17 00:06:19 2004 UTC (5 years, 4 months ago) by kentam
Original Path: incubator/beehive/build.xml
File length: 7504 byte(s)
Initial submission of Beehive code.  See BUILDING.txt and DEVELOPMENT.txt for help building and developing in the codebase.


This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.

  Diffs between and
  Type of Diff should be a

apache@apache.org
ViewVC Help
Powered by ViewVC 1.1.2