mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
69694b7ac0
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
31 lines
1.0 KiB
XML
31 lines
1.0 KiB
XML
<?xml version="1.0"?>
|
|
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
|
|
elementFormDefault="qualified">
|
|
<xs:attributeGroup name="attribute-group">
|
|
<xs:attribute name="ag-att-1" type="xs:normalizedString" use="required"/>
|
|
<xs:attribute name="ag-att-2" type="xs:normalizedString" use="optional"/>
|
|
<xs:attribute name="ag-att-3" type="xs:normalizedString" fixed="fixed attribute value"/>
|
|
</xs:attributeGroup>
|
|
|
|
<xs:element name="attributes">
|
|
<xs:complexType>
|
|
<xs:sequence>
|
|
<xs:element name="element_string_no_default"
|
|
type="xs:normalizedString"
|
|
minOccurs="1"
|
|
maxOccurs="1"/>
|
|
<xs:element name="element_string_with_default"
|
|
type="xs:normalizedString"
|
|
minOccurs="1"
|
|
maxOccurs="1"
|
|
default="default string value"/>
|
|
</xs:sequence>
|
|
<xs:attribute name="att-1"
|
|
type="xs:normalizedString"
|
|
use="required"/>
|
|
<xs:attributeGroup ref="attribute-group"/>
|
|
</xs:complexType>
|
|
</xs:element>
|
|
</xs:schema>
|
|
|