[go: up one dir, main page]
Menu ▾ ▴

Commit [r7538]  Maximize  Restore  History

merge trunk (r7493:7537) to branch

pangloss 2008-07-17

Browse code at this revision

Parent: [r7537]

Child: [r7539]

1 2 3 .. 8 > >> (Page 1 of 8)
changed /fedora/branches/dev-149853/build.xml
changed /fedora/branches/dev-149853/license/docstyle.css
changed /fedora/branches/dev-149853/license/license.html
changed /fedora/branches/dev-149853/readme.txt
removed /fedora/branches/dev-149853/src/demo-objects/atom
copied /fedora/trunk/src/demo-objects/batch-demo -> /fedora/branches/dev-149853/src/demo-objects/batch-demo
copied /fedora/trunk/src/demo-objects/batch-demo/foxml-template.xml -> /fedora/branches/dev-149853/src/demo-objects/batch-demo/foxml-template.xml
copied /fedora/trunk/src/demo-objects/batch-demo/mets-template.xml -> /fedora/branches/dev-149853/src/demo-objects/batch-demo/mets-template.xml
copied /fedora/trunk/src/demo-objects/batch-demo/modify-batch-directives.xml -> /fedora/branches/dev-149853/src/demo-objects/batch-demo/modify-batch-directives.xml
copied /fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples -> /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples
copied /fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments -> /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments
copied /fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-model.3.xml -> /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-model.3.xml
copied /fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-object.3.xml -> /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-object.3.xml
copied /fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-object.xml -> /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-object.xml
copied /fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-sdef.1.xml -> /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-sdef.1.xml
copied /fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-sdef.2.xml -> /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-sdef.2.xml
copied /fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-sdef.3.xml -> /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-sdef.3.xml
copied /fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-sdep.1.xml -> /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-sdep.1.xml
copied /fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-sdep.2.xml -> /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-sdep.2.xml
copied /fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments.model.xml -> /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments.model.xml
copied /fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples/conflicting-deployments -> /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples/conflicting-deployments
copied /fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples/conflicting-deployments/public-objects -> /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples/conflicting-deployments/public-objects
copied /fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples/conflicting-deployments/public-objects/demo_conflicting-deployment.model.xml -> /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples/conflicting-deployments/public-objects/demo_conflicting-deployment.model.xml
copied /fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples/conflicting-deployments/public-objects/demo_conflicting-deployment.object.xml -> /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples/conflicting-deployments/public-objects/demo_conflicting-deployment.object.xml
copied /fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples/conflicting-deployments/public-objects/demo_conflicting-deployment.sdef.xml -> /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples/conflicting-deployments/public-objects/demo_conflicting-deployment.sdef.xml
/fedora/branches/dev-149853/build.xml Diff Switch to side-by-side view
Loading...
/fedora/branches/dev-149853/license/docstyle.css Diff Switch to side-by-side view
Loading...
/fedora/branches/dev-149853/license/license.html Diff Switch to side-by-side view
Loading...
/fedora/branches/dev-149853/readme.txt Diff Switch to side-by-side view
Loading...
/fedora/branches/dev-149853/src/demo-objects/atom
File was removed.
/fedora/trunk/src/demo-objects/batch-demo to /fedora/branches/dev-149853/src/demo-objects/batch-demo
File was copied.
/fedora/trunk/src/demo-objects/batch-demo/foxml-template.xml to /fedora/branches/dev-149853/src/demo-objects/batch-demo/foxml-template.xml
File was copied.
/fedora/trunk/src/demo-objects/batch-demo/mets-template.xml to /fedora/branches/dev-149853/src/demo-objects/batch-demo/mets-template.xml
File was copied.
/fedora/trunk/src/demo-objects/batch-demo/modify-batch-directives.xml to /fedora/branches/dev-149853/src/demo-objects/batch-demo/modify-batch-directives.xml
File was copied.
/fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples to /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples
File was copied.
/fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments to /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments
File was copied.
/fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-model.3.xml to /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-model.3.xml
File was copied.
/fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-object.3.xml to /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-object.3.xml
File was copied.
/fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-object.xml to /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-object.xml
File was copied.
/fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-sdef.1.xml to /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-sdef.1.xml
File was copied.
/fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-sdef.2.xml to /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-sdef.2.xml
File was copied.
/fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-sdef.3.xml to /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-sdef.3.xml
File was copied.
/fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-sdep.1.xml to /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-sdep.1.xml
File was copied.
/fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-sdep.2.xml to /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments-sdep.2.xml
File was copied.
/fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments.model.xml to /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples/composite-deployments/demo_composite-deployments.model.xml
File was copied.
/fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples/conflicting-deployments to /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples/conflicting-deployments
File was copied.
/fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples/conflicting-deployments/public-objects to /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples/conflicting-deployments/public-objects
File was copied.
/fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples/conflicting-deployments/public-objects/demo_conflicting-deployment.model.xml to /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples/conflicting-deployments/public-objects/demo_conflicting-deployment.model.xml
File was copied.
/fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples/conflicting-deployments/public-objects/demo_conflicting-deployment.object.xml to /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples/conflicting-deployments/public-objects/demo_conflicting-deployment.object.xml
File was copied.
/fedora/trunk/src/demo-objects/foxml/local-server-demos/cma-examples/conflicting-deployments/public-objects/demo_conflicting-deployment.sdef.xml to /fedora/branches/dev-149853/src/demo-objects/foxml/local-server-demos/cma-examples/conflicting-deployments/public-objects/demo_conflicting-deployment.sdef.xml
File was copied.
1 2 3 .. 8 > >> (Page 1 of 8)