Derek Hulley
d94db4e310
Added removeProperty method to NodeService.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5558 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-26 08:34:43 +00:00
Derek Hulley
138d1780cb
Merged V2.0 to HEAD
...
5456: (From WCM_DEPLOY)
There were many pure conflicts on license headers, one conflict due to CR-LF and
some other smaller issues to resolve:
-----------------------------------------
Resolved (line endings not cr-lf):
root\projects\repository\config\alfresco\public-services-context.xml
Reverted:
root\projects\web-client\source\web\images\icons\ajax_anim.gif
Reverted or Resolved (License text conflicts):
svn revert root\projects\jndi-client\source\java\org\alfresco\jndi\JndiTest.java
svn resolved root\projects\jndi-client\source\java\org\alfresco\jndi\AVMFileDirContext.java
svn revert root\projects\jndi-client\source\java\org\alfresco\jndi\AVMBulkLoader.java
svn revert root\projects\jndi-client\source\java\org\alfresco\filter\CacheControlFilter.java
svn revert root\projects\jndi-client\source\java\org\alfresco\filter\CacheControlFilterInfoBean.java
svn revert -R root\projects\catalina-virtual\source\java\org\alfresco\mbeans
svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\context\AVMStandardContext.java
svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\loader\AVMWebappClassLoader.java
svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\loader\AVMWebappLoader.java
svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMResourceBinding.java
svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHostConfig.java
- why the change in method naming convention?
svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHost.java
svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\DefaultAVMResourceBinding.java
svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\valve\AVMUrlValveTest.java
svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\valve\AVMUrlValve.java
svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHostMatch.java
Modified:
root\projects\web-client\source\java\org\alfresco\web\ui\wcm\component\UIDeployWebsite.java (Kevin to check line 330)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5484 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-12 01:41:14 +00:00
Paul Holmes-Higgin
4e2300f095
Updated copyright
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5186 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-19 17:17:36 +00:00
Derek Hulley
0c10d61a48
Merged V2.0 to HEAD
...
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5141 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@51352 .
- FLOSS
- Some files will need a follow-up
-root/projects/repository/source/java/org/alfresco/repo/avm/wf/AVMRemoveWFStoreHandler.java (not yet on HEAD: 5094)
-root/projects/repository/source/java/org/alfresco/filesys/server/state/FileStateLockManager.java (not yet on HEAD: 5093)
-onContentUpdateRecord (not on HEAD)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5167 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-16 06:44:46 +00:00
Paul Holmes-Higgin
31c250682b
Changed licence headers
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5081 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-08 18:59:58 +00:00
Britt Park
60eadcf3ff
Fixed test failure.
...
Slightly tuned version of another test.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4709 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-03 01:35:03 +00:00
Derek Hulley
61c2f1a614
Added removeChildAssociation method to NodeService
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4706 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-02 14:25:16 +00:00
Britt Park
87b5690fc2
Some cleaning up of the AVMService and derived interfaces.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4624 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-16 18:17:18 +00:00
Kevin Roast
d03bc33acb
. Moved avm specific types from ContentModel (cm) into WCMModel (wcm)
...
. Updated appropriate AVM and client classes to use new types
. Updated application types to derive from wcm types
NOTE: You will need a new database - this is NOT backward compatible with current websites!
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4022 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-04 16:39:26 +00:00
Britt Park
8da23d1cdc
Reworked addAspect so that it wouldn't be quite so achingly slow.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4006 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-03 14:11:46 +00:00
Britt Park
c2e407165e
Changed AVMNodeConverter.ToAVMVersionPath() to return a
...
Pair<Integer, String>.
Fixed avm.jsp which got busted by last checkin.
Added implementation of AddChild to AVMNodeService.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3983 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-30 17:51:15 +00:00
Britt Park
0db9ace91f
Turned off policy callbacks in AVMNodeService. The right place for those
...
is in AVMService. Until then these speeds things up considerably.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3982 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-30 15:22:11 +00:00
Britt Park
8e56ad390c
Added missing callbacks to AVMNodeService. This makes things slow.
...
Have to do something about that.
Added getPaths call to AVMService. Retrieves all possible paths to a node.
Need to do timing tests.
I believe, the 6th version of a Pair template class. This one's public and
perhaps when we have time we could use it in place of all the inner class
implementations.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3964 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-28 20:19:48 +00:00
Britt Park
4b46782156
Have a decrepit basic WCM submit workflow working.
...
Fixed bug in handling requests for AVM Node properties which don't have
a dictionary type definition.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3871 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-21 02:18:00 +00:00
Britt Park
6f565e2be1
Added removeNode(String path) to AVMService as a convenience and to
...
reduce my shame. Beefed up path robustness in AVMNodeConverter.SplitBase().
Removed an unneeded import from AVMNodeService.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3862 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-20 13:54:53 +00:00
Britt Park
a9ceb090ee
Fixed Node Browser bug introduced during lookup failure rejiggering.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3833 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-18 18:09:09 +00:00
Britt Park
194d96082c
Change the behavior of AVMService.getAVMStore() and AVMService.lookup()
...
methods to return null for not found instead of throwing an exception.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-13 14:54:25 +00:00
Britt Park
be6a222554
Extended the content model to include relevant avm specific types.
...
cm:avmcontent and cm:avmfolder are 'abstract'. cm:avmplaincontent is derived
from cm:avmcontent and is just a plain file. cm:avmlayeredcontent is derived
from cm:avmcontent and is (surprise) a layered file and has a d:noderef mandatory
property, cm:avmfileindirection, that is the (possibly non-existent) file that
the layered file is transparent to. cm:avmplainfolder is derived from
cm:avmfolder and is just a plain directory. cm:avmlayeredfolder is a layered
directory and has a property, cm:avmdirinderection, that is the (possibly
non-existent) directory that the layered directory is transparent to.
The ContentModel QName constants are.
TYPE_AVM_PLAIN_FOLDER
TYPE_AVM_LAYERED_FOLDER
TYPE_AVM_PLAIN_CONTENT
TYPE_AVM_LAYERED_CONTENT
PROP_AVM_DIR_INDIRECTION
PROP_AVM_FILE_INDIRECTION
One can now create all four flavors of avm nodes through
AVMNodeService.createNode(). The advantage of using these over the
corresponding AVMService methods is that since (for now) AVMService, is
permission and indexing unaware.
Backed out cm:mounted aspect and dispatching code in DbNodeServiceImpl.
(Dave and Derek, you may now relax) as we are implementing the UI with
AVM dedicated screens.
Finally, beginning interface for AVM node tree synchronization and comparison.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3764 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-12 03:16:10 +00:00
Britt Park
8a95b09b98
Added new AVM node type DeletedNode (aka, ghost, tombstone), a marker node for a
...
node that has been deleted in a version. This makes tree comparisons easier by
resolving the cases in which one wants to know whether a deletions is more or less
recent than another version of a node. Along the way got rid of DeletedChild and
friends including a table in the schema, since DeletedNode takes on all the work
that it performed.
Deleted two illegally named files in Virgin content.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3748 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-10 17:20:35 +00:00
Britt Park
961c0b41d8
AVMNodeService accepts cm:content, and cm:folder, as types for createNode as
...
well as cm:avmcontent and cm:avmfolder. It also spoofs a name property which
should make other service happier with it.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3734 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-08 17:54:50 +00:00
Britt Park
08ecce31b6
Added types cm:avmcontent (derived from cm:content) TYPE_AVM_CONTENT and
...
cm:avmfolder (derived from cm:folder) TYPE_AVM_FOLDER as handles for UI.
Fixed configuration goofs I introduced recently that caused Node Browsing
to barf on content nodes.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3725 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-08 04:47:21 +00:00
Britt Park
920c487867
Cleanup of ACL reading/writing for PermissionsDaoComponent. All access is
...
through the AccessControlListDAO interface.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3700 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-06 00:41:41 +00:00
Britt Park
1fd96d13d5
This changes PermissionsDaoComponentImpl to work with NodeRefs instead
...
of Nodes so that Permissions can be used with AVM nodes. It needs
to be factored a little bit differently, so consider this a WIP.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3698 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-05 14:17:34 +00:00
Britt Park
be987843f5
Properly hooked up the on close callback for output streams to AVM Nodes.
...
Got rid of a now superfluous setContentData() call, and now treat files
with no content url (yet) as having length 0.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3660 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-02 21:47:09 +00:00
Britt Park
db3c29b45e
Moved stuff around to be more Alfresco standard.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3658 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-02 00:45:48 +00:00
Britt Park
484dda3b92
This makes AVMNodeService policy aware.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3619 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-08-28 19:12:26 +00:00
Britt Park
8031cc6574
Big honkin' merge from head. Sheesh!
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-08-27 01:01:30 +00:00
Britt Park
0606fa3ab6
AVM Nodes are (theoretically) mostly aspect ready. AVMNodeService is
...
now derived from AbstractNodeServiceImpl to make policy awareness easier.
Moved addDefaultPropertyValues from DbNodeServiceImpl to
AbstractNodeServiceImpl so AVMNodeService can use it. A fix for an
NPE that showed up in stress test.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3603 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-08-24 18:36:59 +00:00
Britt Park
26877f6105
The Node Browser in the UI can now navigate AVM stores.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3553 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-08-21 14:05:52 +00:00
Britt Park
06df2021c8
This changes the AVM service to use ContentService for storage. This gives us,
...
in theory, AVM working underneath (more or less) NodeService and ContentService.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3481 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-08-10 21:50:34 +00:00
Britt Park
9455745ba8
Added deleteNodeProperties to AVMService interface. Fits in well with NodeService
...
behavior. Outline of implementation of AVMNodeService, an AVM based
implementationof NodeService.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3438 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-07-31 16:38:39 +00:00