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
79 lines
4.8 KiB
XML
79 lines
4.8 KiB
XML
<?xml version="1.0"?>
|
|
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
|
|
xmlns:alf="http://www.alfresco.org"
|
|
elementFormDefault="qualified">
|
|
<xs:simpleType name="five_string_values">
|
|
<xs:restriction base="xs:normalizedString">
|
|
<xs:enumeration value="one"/>
|
|
<xs:enumeration value="two"/>
|
|
<xs:enumeration value="three"/>
|
|
<xs:enumeration value="four"/>
|
|
<xs:enumeration value="five"/>
|
|
</xs:restriction>
|
|
</xs:simpleType>
|
|
<xs:element name="readonly-and-default-values">
|
|
<xs:complexType>
|
|
<xs:sequence>
|
|
<xs:element name="elements">
|
|
<xs:complexType>
|
|
<xs:sequence>
|
|
<xs:element name="fixed_string" type="xs:normalizedString" fixed="fixed string element value"/>
|
|
<xs:element name="default_string" type="xs:normalizedString" default="default string element value"/>
|
|
<xs:element name="fixed_integer" type="xs:integer" fixed="3"/>
|
|
<xs:element name="default_integer" type="xs:integer" default="3"/>
|
|
<xs:element name="fixed_date" type="xs:date" fixed="1978-08-08"/>
|
|
<xs:element name="default_date" type="xs:date" default="1978-08-08"/>
|
|
<xs:element name="fixed_time" type="xs:time" fixed="14:45:00"/>
|
|
<xs:element name="default_time" type="xs:time" default="14:45:00"/>
|
|
<xs:element name="fixed_radio" type="five_string_values" fixed="three">
|
|
<xs:annotation><xs:appinfo><alf:appearance>full</alf:appearance></xs:appinfo></xs:annotation>
|
|
</xs:element>
|
|
<xs:element name="default_radio" type="five_string_values" default="three">
|
|
<xs:annotation><xs:appinfo><alf:appearance>full</alf:appearance></xs:appinfo></xs:annotation>
|
|
</xs:element>
|
|
<xs:element name="fixed_combobox" type="five_string_values" fixed="three">
|
|
<xs:annotation><xs:appinfo><alf:appearance>minimal</alf:appearance></xs:appinfo></xs:annotation>
|
|
</xs:element>
|
|
<xs:element name="default_combobox" type="five_string_values" default="three">
|
|
<xs:annotation><xs:appinfo><alf:appearance>minimal</alf:appearance></xs:appinfo></xs:annotation>
|
|
</xs:element>
|
|
<xs:element name="fixed_textarea" type="xs:string" fixed="fixed string value"/>
|
|
<xs:element name="default_textarea" type="xs:string" default="default string value"/>
|
|
<xs:element name="fixed_checkbox" type="xs:boolean" fixed="true"/>
|
|
<xs:element name="default_checkbox" type="xs:boolean" default="true"/>
|
|
</xs:sequence>
|
|
</xs:complexType>
|
|
</xs:element>
|
|
<xs:element name="attributes">
|
|
<xs:complexType>
|
|
<xs:attribute name="fixed_string" type="xs:normalizedString" fixed="fixed string attribute value"/>
|
|
<xs:attribute name="default_string" type="xs:normalizedString" default="default string attribute value"/>
|
|
<xs:attribute name="fixed_integer" type="xs:integer" fixed="3"/>
|
|
<xs:attribute name="default_integer" type="xs:integer" default="3"/>
|
|
<xs:attribute name="fixed_date" type="xs:date" fixed="1978-08-08"/>
|
|
<xs:attribute name="default_date" type="xs:date" default="1978-08-08"/>
|
|
<xs:attribute name="fixed_time" type="xs:time" fixed="14:45:00"/>
|
|
<xs:attribute name="default_time" type="xs:time" default="14:45:00"/>
|
|
<xs:attribute name="fixed_radio" type="five_string_values" fixed="three">
|
|
<xs:annotation><xs:appinfo><alf:appearance>full</alf:appearance></xs:appinfo></xs:annotation>
|
|
</xs:attribute>
|
|
<xs:attribute name="default_radio" type="five_string_values" default="three">
|
|
<xs:annotation><xs:appinfo><alf:appearance>full</alf:appearance></xs:appinfo></xs:annotation>
|
|
</xs:attribute>
|
|
<xs:attribute name="fixed_combobox" type="five_string_values" fixed="three">
|
|
<xs:annotation><xs:appinfo><alf:appearance>minimal</alf:appearance></xs:appinfo></xs:annotation>
|
|
</xs:attribute>
|
|
<xs:attribute name="default_combobox" type="five_string_values" default="three">
|
|
<xs:annotation><xs:appinfo><alf:appearance>minimal</alf:appearance></xs:appinfo></xs:annotation>
|
|
</xs:attribute>
|
|
<xs:attribute name="fixed_textarea" type="xs:string" fixed="fixed attribute value"/>
|
|
<xs:attribute name="default_textarea" type="xs:string" default="default attribute value"/>
|
|
<xs:attribute name="fixed_checkbox" type="xs:boolean" fixed="true"/>
|
|
<xs:attribute name="default_checkbox" type="xs:boolean" default="true"/>
|
|
</xs:complexType>
|
|
</xs:element>
|
|
</xs:sequence>
|
|
</xs:complexType>
|
|
</xs:element>
|
|
</xs:schema>
|