mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-14 17:58:59 +00:00
Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119423 skopf: Merged AOS-SEPARATION (5.1.0) to 5.1-MC1 (5.1.0)
115135 skopf: ALF-21405 - AOS should be an optional removable module:
BDE-415 - Include AOS module in installer:
Get sharepoint-masquerade from alfresco-sharepoint-masquerade-distributionzip instead of individually from repository and local files
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119937 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jean-Pierre Huynh
@@ -18,7 +18,7 @@
|
||||
<destination>${alfresco_amps_directory}</destination>
|
||||
<platforms>all</platforms>
|
||||
<distributionFileList>
|
||||
<distributionFile origin="${alfresco_amps_source_directory}/alfresco-sharepoint-masquerade-*.amp" allowWildcards="1" />
|
||||
<distributionFile origin="${sharepoint_masquerade_distribution_folder}/alfresco-sharepoint-masquerade-*.amp" allowWildcards="1" />
|
||||
</distributionFileList>
|
||||
<actionList>
|
||||
<setInstallerVariable name="alfresco_apply_amps" value="1"/>
|
||||
@@ -29,7 +29,7 @@
|
||||
<description>//War Files</description>
|
||||
<destination>${installdiralfresco}</destination>
|
||||
<distributionFileList>
|
||||
<distributionFile origin="${alfresco_amps_source_directory}/_vti_bin.war" allowWildcards="1" />
|
||||
<distributionFile origin="${sharepoint_masquerade_distribution_folder}/_vti_bin.war" allowWildcards="1" />
|
||||
</distributionFileList>
|
||||
</folder>
|
||||
<folder>
|
||||
@@ -41,7 +41,7 @@
|
||||
<alfrescoConfigure alfrescoFiles="*/*"/>
|
||||
</actionList>
|
||||
<distributionFileList>
|
||||
<distributionFile origin="${build_project_directory}/bitrock/alfrescosharepointmasquerade/shared/extension/*" allowWildcards="1" />
|
||||
<distributionFile origin="${sharepoint_masquerade_distribution_folder}/extension/*" allowWildcards="1" />
|
||||
</distributionFileList>
|
||||
</folder>
|
||||
<folder>
|
||||
@@ -49,7 +49,7 @@
|
||||
<description>//Alfresco Licenses</description>
|
||||
<destination>${alfresco_base_application_directory}/licenses</destination>
|
||||
<distributionFileList>
|
||||
<distributionFile origin="${build_project_directory}/bitrock/alfrescosharepointmasquerade/licenses/*" allowWildcards="1" />
|
||||
<distributionFile origin="${sharepoint_masquerade_distribution_folder}/*-license.txt" allowWildcards="1" />
|
||||
</distributionFileList>
|
||||
</folder>
|
||||
</folderList>
|
||||
|
||||
@@ -1,85 +0,0 @@
|
||||
COMPONENT LICENSE AGREEMENT
|
||||
|
||||
Thank you for your interest in the Alfresco Office Services Module (the “Component”), designed for use
|
||||
with Alfresco Software, Ltd.’s (“Alfresco”) Community Edition enterprise content management software,
|
||||
as specifically branded as such by Alfresco (the “Alfresco Solution”). While the Alfresco Solution is
|
||||
licensed under separate terms, this Component License Agreement (the “License”) governs use of the
|
||||
Component by the entity on whose behalf you have downloaded the Component (“you”). BY
|
||||
DOWNLOADING, INSTALLING, OR OTHERWISE ACCESSING OR USING THE COMPONENT, YOU AGREE
|
||||
TO THE TERMS OF THIS LICENSE. IF YOU DO NOT AGREE, OR DO NOT HAVE AUTHORITY TO ACCEPT
|
||||
THIS LICENSE, YOU MAY NOT USE THE COMPONENT. Accordingly, you and Alfresco acknowledge and
|
||||
agree as follows:
|
||||
|
||||
1. LICENSE. Subject to your complete and ongoing compliance with all the terms and conditions set forth
|
||||
in this License, Alfresco grants you the following limited, non-exclusive, non-transferable, non-
|
||||
sublicensable licenses, in object code form only, to:
|
||||
|
||||
a. use the Component internally in your organization for the purposes of developing an
|
||||
implementation of the Component that interoperates with your authorized internal deployment
|
||||
of the Alfresco Solution; and
|
||||
|
||||
b. internally deploy the Component for the purpose of enabling interoperability of its features with
|
||||
your internal deployment of the Alfresco Solution;
|
||||
|
||||
c. distribute unmodified copies of the Component solely under the terms of this License, which will
|
||||
govern use of the Component by any such distributee.
|
||||
|
||||
2. RESTRICTIONS. You may not use the Component for any purpose other than interoperating with the
|
||||
Alfresco Solution in a manner for which the Component and the Alfresco Solution are expressly
|
||||
designed. The Component may not be decompiled, reverse engineered, or operated or integrated with
|
||||
any enterprise software program other than the Alfresco Solution, regardless of whether the third-party
|
||||
program is provided on a free or paid basis. Any use in violation of the preceding limitations and
|
||||
restrictions is a violation of this License and is strictly prohibited. For the avoidance of doubt, nothing in
|
||||
this License shall be deemed or interpreted to restrict or limit any rights you may have under any
|
||||
separately licensed software, including open source software.
|
||||
|
||||
3. RESERVATION OF RIGHTS. The Component, including its source code, complied code, content, visual
|
||||
interfaces, features, and documentation (the “Alfresco Materials”), and the intellectual property rights
|
||||
thereto, are owned by Alfresco or its subsidiaries or affiliated companies and/or its third-party licensors.
|
||||
You do not acquire any right, title or interest to the Alfresco Materials, whether by implication, estoppel,
|
||||
or otherwise, except for the limited rights set forth in this License.
|
||||
|
||||
4. FEEDBACK. If you choose to provide Alfresco with any comments, bug reports, feedback,
|
||||
enhancements, modifications, or suggestions with respect to the Component or its interaction with the
|
||||
Alfresco Solution (“Feedback”), such Feedback is provided on a non-confidential basis (notwithstanding
|
||||
any notice to the contrary you may include in any accompanying communication), and you grant
|
||||
Alfresco and its successors the unlimited right to use, license, and exploit such Feedback without
|
||||
limitation, including, but not limited to the incorporation of such suggested changes into the Component
|
||||
or the Alfresco Solution. You hereby grant Alfresco a perpetual, irrevocable, transferable, sublicensable,
|
||||
nonexclusive license under all rights necessary to so incorporate and use your Feedback for any purpose,
|
||||
including to make and sell products and services.
|
||||
|
||||
5. TERM AND TERMINATION. The License, and your rights and licenses hereunder, will terminate
|
||||
immediately upon your breach of the License. You may terminate the License by uninstalling and ceasing
|
||||
all use of the Component. Following any termination of this License, you must immediately uninstall and
|
||||
cease use of the Component, and destroy all copies. Sections 3, 4, 4, 5, 5, 6, shall survive any
|
||||
termination of this License.
|
||||
|
||||
6. WARRANTY DISCLAIMER AND LIMITATION OF LIABILITY. THE COMPONENT IS PROVIDED ON AN "AS IS"
|
||||
BASIS, WITHOUT WARRANTY OF ANY KIND. TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE
|
||||
LAW, ALFRESCO DISCLAIMS ALL WARRANTIES AND CONDITIONS, EXPRESS, IMPLIED, STATUTORY OR
|
||||
OTHERWISE, INCLUDING BUT NOT LIMITED TO IMPLIED WARRANTIES OR CONDITIONS OF FITNESS FOR
|
||||
A PARTICULAR PURPOSE, MERCHANTABILITY, AND NON-INFRINGEMENT. UNDER NO CIRCUMSTANCES
|
||||
WILL ALFRESCO BE LIABLE FOR ANY DAMAGES OF ANY KIND, DIRECT, INDIRECT, CONSEQUENTIAL,
|
||||
INCIDENTAL, SPECIAL EXEMPLARY, OR PUNITIVE DAMAGES WHATSOEVER ARISING OUT OF THE USE OR
|
||||
INABILITY TO USE THE COMPONENT, EVEN IF ALFRESCO HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES, AND NOTWITHSTANDING ANY FAILURE OF ESSENTIAL PURPOSE OF ANY LIMITED
|
||||
REMEDY PROVIDED HEREIN. YOU AGREE THAT THE FOREGOING LIMITATIONS OF DAMAGES AND
|
||||
LIABILITY ARE REASONABLE AN ESSENTIAL PART OF THE BARGAIN ENABLING US TO PROVIDE YOU THIS
|
||||
LICENSE TO THE COMPONENT WITHOUT PAYMENT OF ANY FEES.
|
||||
|
||||
7. GOVERNING LAW; VENUE. Any claim relating to the Component shall be governed by the laws of
|
||||
California, without regard to conflict-of-law provisions. Disputes arising under this shall be resolved in,
|
||||
and subject to the sole and exclusive jurisdiction of the state and federal courts located in the Northern
|
||||
District of California.
|
||||
|
||||
8. MISCELLANEOUS. This License is the entire agreement between you and Alfresco with respect to the
|
||||
Component, and supersedes any and all prior agreements, negotiations, or other communications
|
||||
between you and Alfresco, whether oral or written. In the event that any provision of this License is held
|
||||
to be invalid or unenforceable, then: (a) such provision shall be deemed reformed to the extent strictly
|
||||
necessary to render such provision valid and enforceable, or if not capable of such reformation shall be
|
||||
deemed severed from this License; and (b) the validity and enforceability of all of the other provisions
|
||||
hereof, shall in no way be affected or impaired thereby. The failure to exercise, or delay in exercising, a
|
||||
right, power or remedy provided in this License or by law shall not constitute a waiver of that right,
|
||||
power or remedy, and a waiver of any obligation or breach of this License shall not operate as a waiver
|
||||
of any other obligation or subsequent breach of the License.
|
||||
@@ -1,80 +0,0 @@
|
||||
<!-- _lcid="1033" _version="11.0.5510" _dal="1" -->
|
||||
<!-- _LocalBinding -->
|
||||
<html dir="ltr">
|
||||
<HEAD>
|
||||
<META Name="GENERATOR" Content="Microsoft SharePoint">
|
||||
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
|
||||
<META HTTP-EQUIV="Expires" content="0">
|
||||
<link rel="stylesheet" href="${resourcesUrl}/css/main.css" type="text/css">
|
||||
<link rel="stylesheet" href="${resourcesUrl}/css/picker.css" type="text/css">
|
||||
<Title ID=onetidTitle>File Properties</Title>
|
||||
<script language="JavaScript">
|
||||
function checkScroll()
|
||||
{
|
||||
if (document.body.scrollHeight > document.body.offsetHeight || document.body.scrollWidth > document.body.offsetWidth)
|
||||
document.body.scroll="yes";
|
||||
}
|
||||
</script>
|
||||
<style type="text/css">
|
||||
.deselected {
|
||||
background-color: white;
|
||||
}
|
||||
.selected {
|
||||
background-color: #BBDDFF;
|
||||
}
|
||||
</style>
|
||||
<script type="text/javascript">
|
||||
var oldSelect = null;
|
||||
function selectrow(rowId) {
|
||||
var selectedRow = document.getElementById(rowId);
|
||||
if (oldSelect != null && selectedRow != oldSelect) {
|
||||
oldSelect.className = "deselected";
|
||||
}
|
||||
selectedRow.className = "selected";
|
||||
oldSelect = selectedRow;
|
||||
}
|
||||
</script>
|
||||
<script type="text/javascript">
|
||||
function changeStyle(id)
|
||||
{
|
||||
document.getElementById(id).style.cursor = "pointer";
|
||||
document.getElementById(id).style.textDecoration = "underline";
|
||||
}
|
||||
|
||||
function revertStyle(id)
|
||||
{
|
||||
document.getElementById(id).style.cursor = "default";
|
||||
document.getElementById(id).style.textDecoration = "none";
|
||||
}
|
||||
</script>
|
||||
</HEAD>
|
||||
|
||||
<BODY topmargin=5 leftmargin=5 scroll=no serverType=OWS onload="checkScroll()" onresize="checkScroll()">
|
||||
|
||||
<table width="100%">
|
||||
<tr> <td width="100%" align="rigth"> <img src='${resourcesUrl}/images/logo/AlfrescoLogo200.png' width=200 height=58 alt="Alfresco" title="Alfresco"> </td> </tr>
|
||||
</table>
|
||||
|
||||
<table ID="FileDialogViewTable" width="100%" class="recordSet" style="cursor: default;" cellspacing=0>
|
||||
|
||||
<tr>
|
||||
<th style="padding: 2px; text-align: left; width: 40px;" class="recordSetHeader"> </th>
|
||||
<th style="padding: 2px; text-align: left" class="recordSetHeader">${name}</th>
|
||||
</tr>
|
||||
|
||||
<tr height="5">
|
||||
<td colspan="5"> </td>
|
||||
</tr>
|
||||
|
||||
<#list items as item>
|
||||
<#if item.isFolder()>
|
||||
<tr class="recordSetRow" fileattribute=folder ID="${item.getUrl()}" onmousedown="selectrow('${item.getUrl()}')">
|
||||
<td style="padding: 2px; text-align: left; width: 40px;"><IMG BORDER=0 ALT="Icon" SRC="${resourcesUrl}/images/icons/space-icon-website.gif"></td>
|
||||
<td style="text-align: left; font-size: 250%;">${item.getName()}</td>
|
||||
</tr>
|
||||
</#if>
|
||||
</#list>
|
||||
|
||||
</BODY>
|
||||
|
||||
</html>
|
||||
@@ -1,77 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<beans xmlns="http://www.springframework.org/schema/beans"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
|
||||
|
||||
<bean id="aosDataModelMappingConfiguration" class="org.alfresco.enterprise.repo.officeservices.metadata.StandardDataModelMappingConfiguration" parent="aosBaseDataModelMappingConfiguration">
|
||||
<!-- Use this includedTypesPatterns property to list patterns for Types to activate property mapping for -->
|
||||
<property name="includedTypesPatterns">
|
||||
<list merge="true">
|
||||
<value>.*</value>
|
||||
</list>
|
||||
</property>
|
||||
<!-- Use this excludedTypesPatterns property to exclude specific types from mapping that have been included by the includedTypesPatterns -->
|
||||
<!-- Make sure to keep the merge="true" attribute to exclude some system types -->
|
||||
<!--
|
||||
<property name="excludedTypesPatterns">
|
||||
<list merge="true">
|
||||
<value>\Q{http://www.alfresco.org/model/sample/1.0}sampleType\E</value>
|
||||
<value>\Q{http://www.alfresco.org/model/another-sample/1.0}\E.*</value>
|
||||
</list>
|
||||
</property>
|
||||
-->
|
||||
<!-- By default, the base mapping configuration includes some aspects from the contentModel. You can either replace this list (merge="false") with your -->
|
||||
<!-- own list of aspects or extend this list (merge="true") with additional aspects -->
|
||||
<!--
|
||||
<property name="includedAspectsPatterns">
|
||||
<list merge="true">
|
||||
<value>\Q{http://www.alfresco.org/model/sample/1.0}\E.*</value>
|
||||
</list>
|
||||
</property>
|
||||
-->
|
||||
<!-- Use this excludedAspectsPatterns property to exclude specific aspects from mapping that have been included by the includedAspectsPatterns -->
|
||||
<!-- Make sure to keep the merge="true" attribute to exclude some system aspects -->
|
||||
<!--
|
||||
<property name="excludedAspectsPatterns">
|
||||
<list merge="true">
|
||||
<value>\Q{http://www.alfresco.org/model/sample/1.0}sampleAspect\E</value>
|
||||
<value>\Q{http://www.alfresco.org/model/another-sample/1.0}\E.*</value>
|
||||
</list>
|
||||
</property>
|
||||
-->
|
||||
<!-- By default, the base mapping configuration includes all properties with the catch-all wildcard '.*'. You can overwrite this to only include specific properties -->
|
||||
<!--
|
||||
<property name="includedPropertiesPatterns">
|
||||
<list>
|
||||
<value>\Q{http://www.alfresco.org/model/sample/1.0}\E.*</value>
|
||||
</list>
|
||||
</property>
|
||||
-->
|
||||
<!-- Use this excludedPropertiesPatterns property to exclude specific properties from mapping that have been included by the includedPropertiesPatterns -->
|
||||
<!-- Make sure to keep the merge="true" attribute to exclude some system properties -->
|
||||
<!--
|
||||
<property name="excludedPropertiesPatterns">
|
||||
<list merge="true">
|
||||
<value>\Q{http://www.alfresco.org/model/sample/1.0}confidentialData\E</value>
|
||||
</list>
|
||||
</property>
|
||||
-->
|
||||
<!-- Use this includedInstantiableTypesPatterns property to define a list of types users have to choose from when creating a new document with the "Save As" dialog -->
|
||||
<!-- If this property is not set or empty, new documents are always created with the default type for new documents -->
|
||||
<!--
|
||||
<property name="includedInstantiableTypesPatterns">
|
||||
<list>
|
||||
<value>\Q{http://www.alfresco.org/model/sample/1.0}\E.*</value>
|
||||
</list>
|
||||
</property>
|
||||
-->
|
||||
<!-- Use this excludedInstantiableTypesPatterns property to exclude specific types from the list of instantiable types that have been included by the includedInstantiableTypesPatterns -->
|
||||
<!--
|
||||
<property name="excludedInstantiableTypesPatterns">
|
||||
<list>
|
||||
</list>
|
||||
</property>
|
||||
-->
|
||||
</bean>
|
||||
|
||||
</beans>
|
||||
@@ -1,15 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<beans xmlns="http://www.springframework.org/schema/beans"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
|
||||
|
||||
<bean id="customSitesFileDialogWebViewConfiguration" parent="aosBaseFileDialogWebViewConfiguration">
|
||||
<property name="pathPattern">
|
||||
<value>/Sites</value>
|
||||
</property>
|
||||
<property name="templateLocation">
|
||||
<value>alfresco/extension/FileDialog_Sites.ftl</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
</beans>
|
||||
@@ -20,6 +20,7 @@
|
||||
<arg value="--setvars" />
|
||||
<arg line="${bitrock.arguments}" />
|
||||
<arg value="alfresco_distribution_folder=${project.build.directory}/distribution/${alfresco.distribution.name}-${installer.version.name}" />
|
||||
<arg value="sharepoint_masquerade_distribution_folder=${project.build.directory}/distribution/sharepoint-masquerade" />
|
||||
<arg value="binaries_folder=${binaries.folder}/bitrock/binaries-windows" />
|
||||
<arg value="local_binaries_folder=${project.build.directory}/binaries-windows" />
|
||||
<arg value="alfresco_amps_source_directory=${project.build.directory}/dependency" />
|
||||
@@ -38,6 +39,7 @@
|
||||
<arg value="--setvars" />
|
||||
<arg line="${bitrock.arguments}" />
|
||||
<arg value="alfresco_distribution_folder=${project.build.directory}/distribution/${alfresco.distribution.name}-${installer.version.name}" />
|
||||
<arg value="sharepoint_masquerade_distribution_folder=${project.build.directory}/distribution/sharepoint-masquerade" />
|
||||
<arg value="binaries_folder=${binaries.folder}/bitrock/binaries-windows-x64" />
|
||||
<arg value="local_binaries_folder=${project.build.directory}/binaries-windows-x64" />
|
||||
<arg value="alfresco_amps_source_directory=${project.build.directory}/dependency" />
|
||||
@@ -56,6 +58,7 @@
|
||||
<arg value="--setvars" />
|
||||
<arg line="${bitrock.arguments}" />
|
||||
<arg value="alfresco_distribution_folder=${project.build.directory}/distribution/${alfresco.distribution.name}-${installer.version.name}" />
|
||||
<arg value="sharepoint_masquerade_distribution_folder=${project.build.directory}/distribution/sharepoint-masquerade" />
|
||||
<arg value="binaries_folder=${binaries.folder}/bitrock/binaries-linux-x64" />
|
||||
<arg value="local_binaries_folder=${project.build.directory}/binaries-linux-x64" />
|
||||
<arg value="alfresco_amps_source_directory=${project.build.directory}/dependency" />
|
||||
@@ -74,6 +77,7 @@
|
||||
<arg value="--setvars" />
|
||||
<arg line="${bitrock.arguments}" />
|
||||
<arg value="alfresco_distribution_folder=${project.build.directory}/distribution/${alfresco.distribution.name}-${installer.version.name}" />
|
||||
<arg value="sharepoint_masquerade_distribution_folder=${project.build.directory}/distribution/sharepoint-masquerade" />
|
||||
<arg value="binaries_folder=${binaries.folder}/bitrock/binaries-osx-x64" />
|
||||
<arg value="local_binaries_folder=${project.build.directory}/binaries-osx-x64" />
|
||||
<arg value="alfresco_amps_source_directory=${project.build.directory}/dependency" />
|
||||
|
||||
Reference in New Issue
Block a user