You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2012/02/24 15:14:39 UTC
svn commit: r1293264 [4/4] - in /incubator/ooo/branches/alg/install: ./
ext_libraries/apr-util/ ext_libraries/apr-util/prj/ ext_libraries/apr/
ext_libraries/apr/prj/ ext_libraries/serf/ ext_libraries/serf/prj/ main/
main/accessibility/workben/ main/acc...
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/makefile.mk?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/makefile.mk (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/makefile.mk Fri Feb 24 14:14:33 2012
@@ -44,25 +44,45 @@ NO_BSYMBOLIC=TRUE
.INCLUDE: settings.mk
.IF "$(L10N_framework)"==""
-.IF "$(SYSTEM_NEON)" != "YES"
-
-@all:
- @echo "no system neon is used...."
+APRINCDIR=apr
+APRUTILINCDIR=apr-util
+SERFINCDIR=serf
+
+#.IF "$(SYSTEM_APR)" != "YES"
+#.INCLUDE: $(SOLARINCDIR)$/$(APRINCDIR)$/version.mk
+#.ENDIF
+#.IF "$(SYSTEM_APRUTIL)" != "YES"
+#.INCLUDE: $(SOLARINCDIR)$/$(APRUTILINCDIR)$/version.mk
+#.ENDIF
+#.IF "$(SYSTEM_SERF)" != "YES"
+#.INCLUDE: $(SOLARINCDIR)$/$(SERFINCDIR)$/version.mk
+#.ENDIF
+
+#CFLAGS+= -DAPR_VERSION=0x$(APR_VERSION) -DAPRUTIL_VERSION=0x$(APRUTIL_VERSION) -DSERF_VERSION=0x$(SERF_VERSION)
+
+#
+# Extend the list of include paths depending on whether we use locally built
+# or system versions of libraries apr, apr-util, serf, libxml
+#
+# We have to use CFLAGS for this because PRJINC is too inflexible (it adds /inc to everyting.)
+#
+.IF "$(SYSTEM_APR)" == "YES"
+CFLAGS+= $(APR_CFLAGS)
.ELSE
-
-NEONINCDIR=external$/neon
-
-.IF "$(SYSTEM_NEON)" != "YES"
-.INCLUDE: $(SOLARINCDIR)$/$(NEONINCDIR)$/version.mk
+CFLAGS+= -I$(SOLARINCDIR)$/$(APRINCDIR)
.ENDIF
-CFLAGS+= -DNEON_VERSION=0x$(NEON_VERSION)
+.IF "$(SYSTEM_APRUTIL)" == "YES"
+CFLAGS+= $(APRUTIL_CFLAGS)
+.ELSE
+CFLAGS+= -I$(SOLARINCDIR)$/$(APRUTILINCDIR)
+.ENDIF
-.IF "$(SYSTEM_NEON)" == "YES"
-CFLAGS+= $(NEON_CFLAGS)
+.IF "$(SYSTEM_SERF)" == "YES"
+CFLAGS+= $(SERF_CFLAGS)
.ELSE
-CFLAGS+= -I$(SOLARINCDIR)$/$(NEONINCDIR)
+CFLAGS+= -I$(SOLARINCDIR)$/$(SERFINCDIR)
.ENDIF
.IF "$(SYSTEM_LIBXML)" == "YES"
@@ -73,7 +93,7 @@ CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXMLINCDI
.ENDIF
.IF "$(SYSTEM_OPENSSL)" == "YES"
-CFLAGS+= $(OPENSSL_CFLAGS)
+CFLAGS+= -I$(OPENSSL_CFLAGS)
.ENDIF
# --- General -----------------------------------------------------
@@ -89,16 +109,26 @@ SLOFILES=\
$(SLO)$/DAVProperties.obj \
$(SLO)$/DAVSessionFactory.obj \
$(SLO)$/DAVResourceAccess.obj \
- $(SLO)$/NeonUri.obj \
- $(SLO)$/NeonInputStream.obj \
- $(SLO)$/NeonPropFindRequest.obj \
- $(SLO)$/NeonHeadRequest.obj \
- $(SLO)$/NeonSession.obj \
- $(SLO)$/NeonLockStore.obj \
+ $(SLO)$/AprEnv.obj \
+ $(SLO)$/webdavresponseparser.obj \
+ $(SLO)$/SerfUri.obj \
+ $(SLO)$/SerfRequestProcessor.obj \
+ $(SLO)$/SerfRequestProcessorImpl.obj \
+ $(SLO)$/SerfRequestProcessorImplFac.obj \
+ $(SLO)$/SerfPropFindReqProcImpl.obj \
+ $(SLO)$/SerfPropPatchReqProcImpl.obj \
+ $(SLO)$/SerfGetReqProcImpl.obj \
+ $(SLO)$/SerfHeadReqProcImpl.obj \
+ $(SLO)$/SerfPutReqProcImpl.obj \
+ $(SLO)$/SerfPostReqProcImpl.obj \
+ $(SLO)$/SerfDeleteReqProcImpl.obj \
+ $(SLO)$/SerfMkColReqProcImpl.obj \
+ $(SLO)$/SerfCopyReqProcImpl.obj \
+ $(SLO)$/SerfMoveReqProcImpl.obj \
+ $(SLO)$/SerfSession.obj \
+ $(SLO)$/SerfCallbacks.obj \
+ $(SLO)$/SerfInputStream.obj \
$(SLO)$/DateTimeHelper.obj \
- $(SLO)$/LinkSequence.obj \
- $(SLO)$/LockSequence.obj \
- $(SLO)$/LockEntrySequence.obj \
$(SLO)$/UCBDeadPropertyValue.obj
LIB1TARGET=$(SLB)$/_$(TARGET).lib
@@ -118,7 +148,7 @@ SHL1STDLIBS=\
$(SALHELPERLIB) \
$(UCBHELPERLIB) \
$(COMPHELPERLIB) \
- $(NEON3RDLIB) \
+ $(SERFLIBS) \
$(LIBXML2LIB)
.IF "$(GUI)"=="WNT"
@@ -148,8 +178,6 @@ SHL1LIBS=$(LIB1TARGET)
DEF1NAME=$(SHL1TARGET)
-.ENDIF #"$(DISABLE_NEON)" == "TRUE"
-
.ENDIF # L10N_framework
# --- Targets ----------------------------------------------------------
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavcontent.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavcontent.cxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavcontent.cxx (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavcontent.cxx Fri Feb 24 14:14:33 2012
@@ -81,11 +81,11 @@
#include "webdavprovider.hxx"
#include "webdavresultset.hxx"
#include "ContentProperties.hxx"
-#include "NeonUri.hxx"
+#include "SerfUri.hxx"
#include "UCBDeadPropertyValue.hxx"
using namespace com::sun::star;
-using namespace webdav_ucp;
+using namespace http_dav_ucp;
//=========================================================================
//=========================================================================
@@ -117,7 +117,7 @@ Content::Content(
rSessionFactory,
Identifier->getContentIdentifier() ) );
- NeonUri aURI( Identifier->getContentIdentifier() );
+ SerfUri aURI( Identifier->getContentIdentifier() );
m_aEscapedTitle = aURI.GetPathBaseName();
}
catch ( DAVException const & )
@@ -803,7 +803,6 @@ void SAL_CALL Content::addProperty( cons
case DAV:
throw lang::IllegalArgumentException();
- case FTP:
case NON_DAV:
// Store property locally.
ContentImplHelper::addProperty( Name,
@@ -920,7 +919,6 @@ void SAL_CALL Content::removeProperty( c
case DAV:
throw beans::UnknownPropertyException();
- case FTP:
case NON_DAV:
// Try to remove property from local store.
ContentImplHelper::removeProperty( Name );
@@ -1038,7 +1036,7 @@ Content::createNewContent( const ucb::Co
// create the local content
try
{
- return new ::webdav_ucp::Content( m_xSMgr,
+ return new ::http_dav_ucp::Content( m_xSMgr,
m_pProvider,
xId,
m_xResAccess->getSessionFactory(),
@@ -1188,7 +1186,7 @@ uno::Reference< sdbc::XRow > Content::ge
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
- aUnescapedTitle = NeonUri::unescape( m_aEscapedTitle );
+ aUnescapedTitle = SerfUri::unescape( m_aEscapedTitle );
xSMgr.set( m_xSMgr );
xIdentifier.set( m_xIdentifier );
xProvider.set( m_xProvider.get() );
@@ -1381,7 +1379,7 @@ uno::Reference< sdbc::XRow > Content::ge
// might trigger HTTP redirect.
// Therefore, title must be updated here.
- NeonUri aUri( xResAccess->getURL() );
+ SerfUri aUri( xResAccess->getURL() );
aUnescapedTitle = aUri.GetPathBaseNameUnescaped();
if ( rType == UNKNOWN )
@@ -1477,7 +1475,7 @@ uno::Reference< sdbc::XRow > Content::ge
m_xCachedProps->addProperties( *xProps.get() );
m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) );
- m_aEscapedTitle = NeonUri::escapeSegment( aUnescapedTitle );
+ m_aEscapedTitle = SerfUri::escapeSegment( aUnescapedTitle );
}
return xResultRow;
@@ -1590,7 +1588,7 @@ uno::Sequence< uno::Any > Content::setPr
{
try
{
- NeonUri aURI( xIdentifier->getContentIdentifier() );
+ SerfUri aURI( xIdentifier->getContentIdentifier() );
aOldTitle = aURI.GetPathBaseNameUnescaped();
if ( aNewValue != aOldTitle )
@@ -1829,7 +1827,7 @@ uno::Sequence< uno::Any > Content::setPr
if ( aNewURL.lastIndexOf( '/' ) != ( aNewURL.getLength() - 1 ) )
aNewURL += rtl::OUString::createFromAscii( "/" );
- aNewURL += NeonUri::escapeSegment( aNewTitle );
+ aNewURL += SerfUri::escapeSegment( aNewTitle );
uno::Reference< ucb::XContentIdentifier > xNewId
= new ::ucbhelper::ContentIdentifier( xSMgr, aNewURL );
@@ -1837,8 +1835,8 @@ uno::Sequence< uno::Any > Content::setPr
try
{
- NeonUri sourceURI( xOldId->getContentIdentifier() );
- NeonUri targetURI( xNewId->getContentIdentifier() );
+ SerfUri sourceURI( xOldId->getContentIdentifier() );
+ SerfUri targetURI( xNewId->getContentIdentifier() );
targetURI.SetScheme( sourceURI.GetScheme() );
xResAccess->MOVE(
@@ -1892,7 +1890,7 @@ uno::Sequence< uno::Any > Content::setPr
aEvent.OldValue = uno::makeAny( aOldTitle );
aEvent.NewValue = uno::makeAny( aNewTitle );
- m_aEscapedTitle = NeonUri::escapeSegment( aNewTitle );
+ m_aEscapedTitle = SerfUri::escapeSegment( aNewTitle );
aChanges.getArray()[ nChanged ] = aEvent;
nChanged++;
@@ -1938,17 +1936,8 @@ uno::Any Content::open(
// Error: Not a folder!
rtl::OUStringBuffer aMsg;
- if ( getResourceType( xEnv ) == FTP )
- {
- // #114653#
- aMsg.appendAscii( "FTP over HTTP proxy: resource cannot "
- "be opened as folder! Wrong Open Mode!" );
- }
- else
- {
- aMsg.appendAscii( "Non-folder resource cannot be "
- "opened as folder! Wrong Open Mode!" );
- }
+ aMsg.appendAscii( "Non-folder resource cannot be "
+ "opened as folder! Wrong Open Mode!" );
ucbhelper::cancelCommandExecution(
uno::makeAny(
@@ -2217,8 +2206,8 @@ void Content::queryChildren( ContentRefL
{
// No further slashes / only a final slash. It's a child!
rChildren.push_back(
- ::webdav_ucp::Content::ContentRef(
- static_cast< ::webdav_ucp::Content * >(
+ ::http_dav_ucp::Content::ContentRef(
+ static_cast< ::http_dav_ucp::Content * >(
xChild.get() ) ) );
}
}
@@ -2283,9 +2272,9 @@ void Content::insert(
// ==> Complain on PUT, continue on MKCOL.
if ( !bTransient || ( bTransient && !bCollection ) )
{
+#undef ERROR
ucb::UnsupportedNameClashException aEx(
- rtl::OUString::createFromAscii(
- "Unable to write without overwrite!" ),
+ rtl::OUString::createFromAscii( "Unable to write without overwrite!" ),
static_cast< cppu::OWeakObject * >( this ),
ucb::NameClash::ERROR );
@@ -2405,7 +2394,7 @@ void Content::insert(
rtl::OUString aTitle;
try
{
- NeonUri aURI( aURL );
+ SerfUri aURI( aURL );
aTitle = aURI.GetPathBaseNameUnescaped();
}
catch ( DAVException const & )
@@ -2495,8 +2484,8 @@ void Content::transfer(
rtl::OUString aTargetURI;
try
{
- NeonUri sourceURI( rArgs.SourceURL );
- NeonUri targetURI( xIdentifier->getContentIdentifier() );
+ SerfUri sourceURI( rArgs.SourceURL );
+ SerfUri targetURI( xIdentifier->getContentIdentifier() );
aTargetURI = targetURI.GetPathBaseNameUnescaped();
// Check source's and target's URL scheme
@@ -2675,7 +2664,7 @@ void Content::transfer(
{
switch ( rArgs.NameClash )
{
- case ucb::NameClash::ERROR:
+ case 0/*ucb::NameClash::ERROR*/:
{
ucbhelper::cancelCommandExecution(
uno::makeAny(
@@ -2733,7 +2722,7 @@ void Content::destroy( sal_Bool bDeleteP
// Process instanciated children...
- ::webdav_ucp::Content::ContentRefList aChildren;
+ ::http_dav_ucp::Content::ContentRefList aChildren;
queryChildren( aChildren );
ContentRefList::const_iterator it = aChildren.begin();
@@ -3190,58 +3179,51 @@ const Content::ResourceType & Content::g
const rtl::OUString aScheme(
rURL.copy( 0, rURL.indexOf( ':' ) ).toAsciiLowerCase() );
- if ( aScheme.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( FTP_URL_SCHEME ) ) )
+ try
{
- eResourceType = FTP;
+ // Try to fetch some frequently used property value, e.g. those
+ // used when loading documents... along with identifying whether
+ // this is a DAV resource.
+ std::vector< DAVResource > resources;
+ std::vector< rtl::OUString > aPropNames;
+ uno::Sequence< beans::Property > aProperties( 5 );
+ aProperties[ 0 ].Name
+ = rtl::OUString::createFromAscii( "IsFolder" );
+ aProperties[ 1 ].Name
+ = rtl::OUString::createFromAscii( "IsDocument" );
+ aProperties[ 2 ].Name
+ = rtl::OUString::createFromAscii( "IsReadOnly" );
+ aProperties[ 3 ].Name
+ = rtl::OUString::createFromAscii( "MediaType" );
+ aProperties[ 4 ].Name
+ = DAVProperties::SUPPORTEDLOCK;
+
+ ContentProperties::UCBNamesToDAVNames(
+ aProperties, aPropNames );
+
+ rResAccess->PROPFIND(
+ DAVZERO, aPropNames, resources, xEnv );
+
+ // TODO - is this really only one?
+ if ( resources.size() == 1 )
+ {
+ m_xCachedProps.reset(
+ new CachableContentProperties( resources[ 0 ] ) );
+ m_xCachedProps->containsAllNames(
+ aProperties, m_aFailedPropNames );
+ }
+
+ eResourceType = DAV;
}
- else
+ catch ( DAVException const & e )
{
- try
- {
- // Try to fetch some frequently used property value, e.g. those
- // used when loading documents... along with identifying whether
- // this is a DAV resource.
- std::vector< DAVResource > resources;
- std::vector< rtl::OUString > aPropNames;
- uno::Sequence< beans::Property > aProperties( 5 );
- aProperties[ 0 ].Name
- = rtl::OUString::createFromAscii( "IsFolder" );
- aProperties[ 1 ].Name
- = rtl::OUString::createFromAscii( "IsDocument" );
- aProperties[ 2 ].Name
- = rtl::OUString::createFromAscii( "IsReadOnly" );
- aProperties[ 3 ].Name
- = rtl::OUString::createFromAscii( "MediaType" );
- aProperties[ 4 ].Name
- = DAVProperties::SUPPORTEDLOCK;
-
- ContentProperties::UCBNamesToDAVNames(
- aProperties, aPropNames );
-
- rResAccess->PROPFIND(
- DAVZERO, aPropNames, resources, xEnv );
-
- if ( resources.size() == 1 )
- {
- m_xCachedProps.reset(
- new CachableContentProperties( resources[ 0 ] ) );
- m_xCachedProps->containsAllNames(
- aProperties, m_aFailedPropNames );
- }
+ rResAccess->resetUri();
- eResourceType = DAV;
- }
- catch ( DAVException const & e )
+ if ( e.getStatus() == SC_METHOD_NOT_ALLOWED )
{
- rResAccess->resetUri();
-
- if ( e.getStatus() == SC_METHOD_NOT_ALLOWED )
- {
- // Status SC_METHOD_NOT_ALLOWED is a safe indicator that the
- // resource is NON_DAV
- eResourceType = NON_DAV;
- }
+ // Status SC_METHOD_NOT_ALLOWED is a safe indicator that the
+ // resource is NON_DAV
+ eResourceType = NON_DAV;
}
}
m_eResourceType = eResourceType;
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavcontent.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavcontent.hxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavcontent.hxx (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavcontent.hxx Fri Feb 24 14:14:33 2012
@@ -52,7 +52,7 @@ namespace com { namespace sun { namespac
struct TransferInfo;
} } } }
-namespace webdav_ucp
+namespace http_dav_ucp
{
//=========================================================================
@@ -72,7 +72,6 @@ class Content : public ::ucbhelper::Cont
enum ResourceType
{
UNKNOWN,
- FTP,
NON_DAV,
DAV
};
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavcontentcaps.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavcontentcaps.cxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavcontentcaps.cxx (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavcontentcaps.cxx Fri Feb 24 14:14:33 2012
@@ -41,7 +41,6 @@
#include <com/sun/star/ucb/TransferInfo.hpp>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/util/DateTime.hpp>
-#include <com/sun/star/ucb/Link.hpp>
#include <com/sun/star/ucb/Lock.hpp>
#include <com/sun/star/ucb/LockEntry.hpp>
#include "webdavcontent.hxx"
@@ -50,7 +49,7 @@
#include "ContentProperties.hxx"
using namespace com::sun::star;
-using namespace webdav_ucp;
+using namespace http_dav_ucp;
//=========================================================================
//
@@ -236,14 +235,6 @@ bool ContentProvider::getProperty(
m_pProps->insert(
beans::Property(
- DAVProperties::SOURCE,
- -1,
- getCppuType( static_cast<
- const uno::Sequence< ucb::Link > * >( 0 ) ),
- beans::PropertyAttribute::BOUND ) );
-
- m_pProps->insert(
- beans::Property(
DAVProperties::SUPPORTEDLOCK,
-1,
getCppuType( static_cast<
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavdatasupplier.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavdatasupplier.cxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavdatasupplier.cxx (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavdatasupplier.cxx Fri Feb 24 14:14:33 2012
@@ -39,12 +39,12 @@
#ifndef _WEBDAV_SESSION_HXX
#include "DAVSession.hxx"
#endif
-#include "NeonUri.hxx"
+#include "SerfUri.hxx"
using namespace com::sun::star;
-using namespace webdav_ucp;
+using namespace http_dav_ucp;
-namespace webdav_ucp
+namespace http_dav_ucp
{
//=========================================================================
@@ -399,7 +399,7 @@ sal_Bool DataSupplier::getData()
{
try
{
- NeonUri aURI(
+ SerfUri aURI(
m_pImpl->m_xContent->getResourceAccess().getURL() );
rtl::OUString aPath = aURI.GetPath();
@@ -407,7 +407,7 @@ sal_Bool DataSupplier::getData()
== sal_Unicode( '/' ) )
aPath = aPath.copy( 0, aPath.getLength() - 1 );
- aPath = NeonUri::unescape( aPath );
+ aPath = SerfUri::unescape( aPath );
bool bFoundParent = false;
for ( sal_uInt32 n = 0; n < resources.size(); ++n )
@@ -420,7 +420,7 @@ sal_Bool DataSupplier::getData()
{
try
{
- NeonUri aCurrURI( rRes.uri );
+ SerfUri aCurrURI( rRes.uri );
rtl::OUString aCurrPath = aCurrURI.GetPath();
if ( aCurrPath.getStr()[
aCurrPath.getLength() - 1 ]
@@ -430,7 +430,7 @@ sal_Bool DataSupplier::getData()
0,
aCurrPath.getLength() - 1 );
- aCurrPath = NeonUri::unescape( aCurrPath );
+ aCurrPath = SerfUri::unescape( aCurrPath );
if ( aPath == aCurrPath )
{
bFoundParent = true;
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavdatasupplier.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavdatasupplier.hxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavdatasupplier.hxx (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavdatasupplier.hxx Fri Feb 24 14:14:33 2012
@@ -28,7 +28,7 @@
#include <rtl/ref.hxx>
#include <ucbhelper/resultset.hxx>
-namespace webdav_ucp {
+namespace http_dav_ucp {
struct DataSupplier_Impl;
class Content;
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavprovider.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavprovider.cxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavprovider.cxx (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavprovider.cxx Fri Feb 24 14:14:33 2012
@@ -36,7 +36,7 @@
#include "osl/mutex.hxx"
using namespace com::sun::star;
-using namespace webdav_ucp;
+using namespace http_dav_ucp;
//=========================================================================
//=========================================================================
@@ -130,9 +130,7 @@ ContentProvider::queryContent(
!aScheme.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) &&
!aScheme.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( DAVS_URL_SCHEME ) ) &&
- !aScheme.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( FTP_URL_SCHEME ) ) )
+ RTL_CONSTASCII_STRINGPARAM( DAVS_URL_SCHEME ) ) )
throw ucb::IllegalIdentifierException();
// Normalize URL and create new Id, if nessacary.
@@ -211,7 +209,7 @@ ContentProvider::queryContent(
try
{
- xContent = new ::webdav_ucp::Content(
+ xContent = new ::http_dav_ucp::Content(
m_xSMgr, this, xCanonicId, m_xDAVSessionFactory );
registerNewContent( xContent );
}
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavprovider.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavprovider.hxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavprovider.hxx (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavprovider.hxx Fri Feb 24 14:14:33 2012
@@ -30,7 +30,7 @@
#include <ucbhelper/providerhelper.hxx>
#include "PropertyMap.hxx"
-namespace webdav_ucp {
+namespace http_dav_ucp {
//=========================================================================
@@ -59,10 +59,6 @@ namespace webdav_ucp {
#define DAVS_URL_SCHEME "davs"
#define DAVS_URL_SCHEME_LENGTH 4
-
-
-#define FTP_URL_SCHEME "ftp"
-
#define HTTP_CONTENT_TYPE \
"application/" HTTP_URL_SCHEME "-content"
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavresultset.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavresultset.cxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavresultset.cxx (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavresultset.cxx Fri Feb 24 14:14:33 2012
@@ -38,7 +38,7 @@
#endif
using namespace com::sun::star;
-using namespace webdav_ucp;
+using namespace http_dav_ucp;
//=========================================================================
//=========================================================================
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavresultset.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavresultset.hxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavresultset.hxx (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavresultset.hxx Fri Feb 24 14:14:33 2012
@@ -29,7 +29,7 @@
#include "webdavcontent.hxx"
#include "webdavdatasupplier.hxx"
-namespace webdav_ucp {
+namespace http_dav_ucp {
class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper
{
Modified: incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavservices.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavservices.cxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavservices.cxx (original)
+++ incubator/ooo/branches/alg/install/main/ucb/source/ucp/webdav/webdavservices.cxx Fri Feb 24 14:14:33 2012
@@ -52,10 +52,10 @@ extern "C" void * SAL_CALL component_get
// WebDAV Content Provider.
//////////////////////////////////////////////////////////////////////
- if ( ::webdav_ucp::ContentProvider::getImplementationName_Static().
+ if ( ::http_dav_ucp::ContentProvider::getImplementationName_Static().
compareToAscii( pImplName ) == 0 )
{
- xFactory = ::webdav_ucp::ContentProvider::createServiceFactory( xSMgr );
+ xFactory = ::http_dav_ucp::ContentProvider::createServiceFactory( xSMgr );
}
//////////////////////////////////////////////////////////////////////
Modified: incubator/ooo/branches/alg/install/main/unoil/climaker/cli_oootypes_config
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/unoil/climaker/cli_oootypes_config?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/unoil/climaker/cli_oootypes_config (original)
+++ incubator/ooo/branches/alg/install/main/unoil/climaker/cli_oootypes_config Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
<?xml version="1.0"?>
+<!--***********************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ ***********************************************************-->
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -8,4 +28,4 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
-</configuration>
\ No newline at end of file
+</configuration>
Modified: incubator/ooo/branches/alg/install/main/ure/source/jvmfwk3rc
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ure/source/jvmfwk3rc?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ure/source/jvmfwk3rc (original)
+++ incubator/ooo/branches/alg/install/main/ure/source/jvmfwk3rc Fri Feb 24 14:14:33 2012
@@ -1,3 +1,23 @@
+# *************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# *************************************************************
[Bootstrap]
UNO_JAVA_JFW_VENDOR_SETTINGS=${ORIGIN}/../share/misc/javavendors.xml
UNO_JAVA_JFW_SHARED_DATA=${URE_OVERRIDE_JAVA_JFW_SHARED_DATA} file:///etc/opt/ure/javasettings_${_OS}_${_ARCH}.xml
Modified: incubator/ooo/branches/alg/install/main/ure/source/unorc
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/ure/source/unorc?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/ure/source/unorc (original)
+++ incubator/ooo/branches/alg/install/main/ure/source/unorc Fri Feb 24 14:14:33 2012
@@ -1,3 +1,23 @@
+# *************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# *************************************************************
[Bootstrap]
URE_INTERNAL_LIB_DIR=${ORIGIN}
URE_INTERNAL_JAVA_DIR=${ORIGIN}/../share/java
Modified: incubator/ooo/branches/alg/install/main/vcl/inc/os2/salgdi.h
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/vcl/inc/os2/salgdi.h?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/vcl/inc/os2/salgdi.h (original)
+++ incubator/ooo/branches/alg/install/main/vcl/inc/os2/salgdi.h Fri Feb 24 14:14:33 2012
@@ -340,7 +340,6 @@ void ImplSalDeInitGraphics( Os2SalGraphi
// - Defines -
// -----------
-#define RGBCOLOR(r,g,b) ((ULONG)(((PM_BYTE)(b)|((USHORT)(g)<<8))|(((ULONG)(PM_BYTE)(r))<<16)))
#define TY( y ) (mnHeight-(y)-1)
// offset for lcid field, used for fallback font selection
Modified: incubator/ooo/branches/alg/install/main/vcl/os2/source/gdi/salgdi.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/vcl/os2/source/gdi/salgdi.cxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/vcl/os2/source/gdi/salgdi.cxx (original)
+++ incubator/ooo/branches/alg/install/main/vcl/os2/source/gdi/salgdi.cxx Fri Feb 24 14:14:33 2012
@@ -295,7 +295,7 @@ void Os2SalGraphics::SetLineColor( SalCo
LINEBUNDLE lb;
// set color
- lb.lColor = RGBCOLOR( SALCOLOR_RED( nSalColor ),
+ lb.lColor = MAKE_SALCOLOR( SALCOLOR_RED( nSalColor ),
SALCOLOR_GREEN( nSalColor ),
SALCOLOR_BLUE( nSalColor ) );
@@ -324,7 +324,7 @@ void Os2SalGraphics::SetFillColor( SalCo
AREABUNDLE ab;
// set color
- ab.lColor = RGBCOLOR( SALCOLOR_RED( nSalColor ),
+ ab.lColor = MAKE_SALCOLOR( SALCOLOR_RED( nSalColor ),
SALCOLOR_GREEN( nSalColor ),
SALCOLOR_BLUE( nSalColor ) );
@@ -413,7 +413,7 @@ void Os2SalGraphics::drawPixel( long nX,
// set new color
LINEBUNDLE lb;
- lb.lColor = RGBCOLOR( SALCOLOR_RED( nSalColor ),
+ lb.lColor = MAKE_SALCOLOR( SALCOLOR_RED( nSalColor ),
SALCOLOR_GREEN( nSalColor ),
SALCOLOR_BLUE( nSalColor ) );
Ft2SetAttrs( mhPS,
Modified: incubator/ooo/branches/alg/install/main/vcl/os2/source/gdi/salgdi2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/vcl/os2/source/gdi/salgdi2.cxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/vcl/os2/source/gdi/salgdi2.cxx (original)
+++ incubator/ooo/branches/alg/install/main/vcl/os2/source/gdi/salgdi2.cxx Fri Feb 24 14:14:33 2012
@@ -563,13 +563,13 @@ void Os2SalGraphics::drawMask( const Sal
HPS hPS = mhPS;
IMAGEBUNDLE aBundle, aOldBundle;
AREABUNDLE aAreaBundle, aOldAreaBundle;
- const ULONG nColor = RGBCOLOR( SALCOLOR_RED( nMaskColor ),
+ const ULONG nColor = MAKE_SALCOLOR( SALCOLOR_RED( nMaskColor ),
SALCOLOR_GREEN( nMaskColor ),
SALCOLOR_BLUE( nMaskColor ) );
GpiQueryAttrs( hPS, PRIM_IMAGE, IBB_COLOR | IBB_BACK_COLOR, &aOldBundle );
- aBundle.lColor = RGBCOLOR( 0, 0, 0 );
- aBundle.lBackColor = RGBCOLOR( 0xFF, 0xFF, 0xFF );
+ aBundle.lColor = MAKE_SALCOLOR( 0, 0, 0 );
+ aBundle.lBackColor = MAKE_SALCOLOR( 0xFF, 0xFF, 0xFF );
Ft2SetAttrs( hPS, PRIM_IMAGE, IBB_COLOR | IBB_BACK_COLOR, 0, &aBundle );
GpiQueryAttrs( hPS, PRIM_AREA, ABB_COLOR | ABB_BACK_COLOR | ABB_SYMBOL |
@@ -674,7 +674,7 @@ void Os2SalGraphics::invert( long nX, lo
GpiQueryAttrs( mhPS, PRIM_LINE, LBB_MIX_MODE | LBB_TYPE | LBB_COLOR, &oldLb );
// set linetype to short dash
- lb.lColor = RGBCOLOR( 255, 255, 255 );
+ lb.lColor = MAKE_SALCOLOR( 255, 255, 255 );
lb.usMixMode = FM_XOR;
lb.usType = LINETYPE_ALTERNATE;
Ft2SetAttrs( mhPS, PRIM_LINE, LBB_MIX_MODE | LBB_TYPE | LBB_COLOR, 0, &lb );
@@ -705,7 +705,7 @@ void Os2SalGraphics::invert( long nX, lo
GpiQueryAttrs( mhPS, PRIM_AREA, ABB_COLOR | ABB_MIX_MODE | ABB_SYMBOL, &oldAb );
// set fill color to black
- ab.lColor = RGBCOLOR( 255, 255, 255 );
+ ab.lColor = MAKE_SALCOLOR( 255, 255, 255 );
ab.usMixMode = FM_XOR;
ab.usSymbol = (nFlags & SAL_INVERT_50) ? PATSYM_DENSE5 : PATSYM_SOLID;
Ft2SetAttrs( mhPS, PRIM_AREA, ABB_COLOR | ABB_MIX_MODE | ABB_SYMBOL, 0, &ab );
@@ -740,7 +740,7 @@ void Os2SalGraphics::invert( ULONG nPoin
GpiQueryAttrs( mhPS, PRIM_LINE, LBB_MIX_MODE | LBB_TYPE | LBB_COLOR, &oldLb );
// set linetype to short dash
- lb.lColor = RGBCOLOR( 255, 255, 255 );
+ lb.lColor = MAKE_SALCOLOR( 255, 255, 255 );
lb.usMixMode = FM_XOR;
lb.usType = LINETYPE_ALTERNATE;
Ft2SetAttrs( mhPS, PRIM_LINE, LBB_MIX_MODE | LBB_TYPE | LBB_COLOR, 0, &lb );
@@ -760,7 +760,7 @@ void Os2SalGraphics::invert( ULONG nPoin
GpiQueryAttrs( mhPS, PRIM_AREA, ABB_COLOR | ABB_MIX_MODE | ABB_SYMBOL, &oldAb );
// set fill color to black
- ab.lColor = RGBCOLOR( 255, 255, 255 );
+ ab.lColor = MAKE_SALCOLOR( 255, 255, 255 );
ab.usMixMode = FM_XOR;
ab.usSymbol = (nFlags & SAL_INVERT_50) ? PATSYM_DENSE5 : PATSYM_SOLID;
Ft2SetAttrs( mhPS, PRIM_AREA, ABB_COLOR | ABB_MIX_MODE | ABB_SYMBOL, 0, &ab );
Modified: incubator/ooo/branches/alg/install/main/vcl/os2/source/gdi/salgdi3.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/vcl/os2/source/gdi/salgdi3.cxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/vcl/os2/source/gdi/salgdi3.cxx (original)
+++ incubator/ooo/branches/alg/install/main/vcl/os2/source/gdi/salgdi3.cxx Fri Feb 24 14:14:33 2012
@@ -609,7 +609,7 @@ void Os2SalGraphics::SetTextColor( SalCo
{
CHARBUNDLE cb;
- cb.lColor = RGBCOLOR( SALCOLOR_RED( nSalColor ),
+ cb.lColor = MAKE_SALCOLOR( SALCOLOR_RED( nSalColor ),
SALCOLOR_GREEN( nSalColor ),
SALCOLOR_BLUE( nSalColor ) );
@@ -1157,7 +1157,7 @@ void Os2SalGraphics::GetDevFontList( Imp
{
PFONTMETRICS pFontMetric = &pFontMetrics[i];
-#if OSL_DEBUG_LEVEL>1
+#if OSL_DEBUG_LEVEL>2
debug_printf("Os2SalGraphics::GetDevFontList #%d,'%s'\n", i, pFontMetric->szFacename);
#endif
Modified: incubator/ooo/branches/alg/install/main/writerfilter/source/doctok/cleanupresources
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/writerfilter/source/doctok/cleanupresources?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/writerfilter/source/doctok/cleanupresources (original)
+++ incubator/ooo/branches/alg/install/main/writerfilter/source/doctok/cleanupresources Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
#!/bin/sh
+# *************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# *************************************************************
TEMP=`mktemp -t cleanupresources`
xsltproc tidyxmi.xsl resources.xmi | xmllint --format - > $TEMP
Modified: incubator/ooo/branches/alg/install/main/writerfilter/source/doctok/replacesprmids
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/writerfilter/source/doctok/replacesprmids?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/writerfilter/source/doctok/replacesprmids (original)
+++ incubator/ooo/branches/alg/install/main/writerfilter/source/doctok/replacesprmids Fri Feb 24 14:14:33 2012
@@ -1,5 +1,25 @@
#!/bin/sh
+# *************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# *************************************************************
sed "s/0xc601/NS_sprm::LN_PIstdPermute/g" < $1 > $1.out && mv $1.out $1
sed "s/0xC601/NS_sprm::LN_PIstdPermute/g" < $1 > $1.out && mv $1.out $1
Modified: incubator/ooo/branches/alg/install/main/writerfilter/source/ooxml/modelcleanup
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/writerfilter/source/ooxml/modelcleanup?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/writerfilter/source/ooxml/modelcleanup (original)
+++ incubator/ooo/branches/alg/install/main/writerfilter/source/ooxml/modelcleanup Fri Feb 24 14:14:33 2012
@@ -1,3 +1,24 @@
#!/bin/sh
+# *************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# *************************************************************
+
(xsltproc modelcleanup.xsl model.xml | xmllint --format - > model.xml.tmp) && \
mv model.xml.tmp model.xml
Modified: incubator/ooo/branches/alg/install/main/writerfilter/source/ooxml/rngtocxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/writerfilter/source/ooxml/rngtocxx?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/writerfilter/source/ooxml/rngtocxx (original)
+++ incubator/ooo/branches/alg/install/main/writerfilter/source/ooxml/rngtocxx Fri Feb 24 14:14:33 2012
@@ -1,4 +1,25 @@
#!/bin/sh
+# *************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# *************************************************************
+
xalan -xsl modelpreprocess.xsl -in model.xml > model_processed.xml
xalan -xsl resourcestokens.xsl -in model_processed.xml > OOXMLtokens.hxx
xalan -xsl resources.xsl -in model_processed.xml > OOXMLresources.hxx
Modified: incubator/ooo/branches/alg/install/main/xmerge/source/activesync/XMergeFactory.h
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/xmerge/source/activesync/XMergeFactory.h?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/xmerge/source/activesync/XMergeFactory.h (original)
+++ incubator/ooo/branches/alg/install/main/xmerge/source/activesync/XMergeFactory.h Fri Feb 24 14:14:33 2012
@@ -1,3 +1,23 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
// XMergeFactory.h: interface for the CXMergeFactory class.
//
//////////////////////////////////////////////////////////////////////
Modified: incubator/ooo/branches/alg/install/main/xmerge/source/activesync/XMergeFilter.h
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/xmerge/source/activesync/XMergeFilter.h?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/xmerge/source/activesync/XMergeFilter.h (original)
+++ incubator/ooo/branches/alg/install/main/xmerge/source/activesync/XMergeFilter.h Fri Feb 24 14:14:33 2012
@@ -1,3 +1,83 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
// XMergeFilter.h: interface for the CXMergeFilter class.
//
//////////////////////////////////////////////////////////////////////
Modified: incubator/ooo/branches/alg/install/main/xmerge/source/activesync/XMergeSync.h
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/xmerge/source/activesync/XMergeSync.h?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/xmerge/source/activesync/XMergeSync.h (original)
+++ incubator/ooo/branches/alg/install/main/xmerge/source/activesync/XMergeSync.h Fri Feb 24 14:14:33 2012
@@ -1,3 +1,23 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
// XMergeSyncModule.h: interface for the CXMergeSyncModule class.
//
//////////////////////////////////////////////////////////////////////
Modified: incubator/ooo/branches/alg/install/main/xmerge/source/activesync/resource.h
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/xmerge/source/activesync/resource.h?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/xmerge/source/activesync/resource.h (original)
+++ incubator/ooo/branches/alg/install/main/xmerge/source/activesync/resource.h Fri Feb 24 14:14:33 2012
@@ -1,3 +1,23 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by XMergeSync.rc
Modified: incubator/ooo/branches/alg/install/main/xmerge/source/activesync/stdafx.h
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/xmerge/source/activesync/stdafx.h?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/xmerge/source/activesync/stdafx.h (original)
+++ incubator/ooo/branches/alg/install/main/xmerge/source/activesync/stdafx.h Fri Feb 24 14:14:33 2012
@@ -1,3 +1,23 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
//
// stdafx.h : include file for standard system include files,
// or project specific include files that are used frequently,
Modified: incubator/ooo/branches/alg/install/main/xmerge/source/palmtests/bin/rd
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/xmerge/source/palmtests/bin/rd?rev=1293264&r1=1293263&r2=1293264&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/xmerge/source/palmtests/bin/rd (original)
+++ incubator/ooo/branches/alg/install/main/xmerge/source/palmtests/bin/rd Fri Feb 24 14:14:33 2012
@@ -1,4 +1,24 @@
#!/bin/ksh
+# *************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# *************************************************************
#
# Directories commonly used by this script...
#