Projects information

Chunk

Conflicting content
import org.betaconceptframework.astroboa.api.model.Taxonomy; import org.betaconceptframework.astroboa.api.model.definition.Localization; import org.betaconceptframework.astroboa.api.model.exception.CmsException; <<<<<<< HEAD import org.betaconceptframework.astroboa.api.model.query.Order; ======= import org.betaconceptframework.astroboa.api.model.io.ImportConfiguration; import org.betaconceptframework.astroboa.api.model.io.ImportConfiguration.PersistMode; >>>>>>> 231bac1b004c8d38f89320b5db3a097b6fecf54a import org.betaconceptframework.astroboa.api.model.query.criteria.CmsCriteria.SearchMode; import org.betaconceptframework.astroboa.api.model.query.criteria.ContentObjectCriteria; import org.betaconceptframework.astroboa.api.model.query.criteria.RepositoryUserCriteria;

Conflicting content

import org.betaconceptframework.astroboa.api.model.Taxonomy;
import org.betaconceptframework.astroboa.api.model.definition.Localization;
import org.betaconceptframework.astroboa.api.model.exception.CmsException;
<<<<<<< HEAD
import org.betaconceptframework.astroboa.api.model.query.Order;
=======
import org.betaconceptframework.astroboa.api.model.io.ImportConfiguration;
import org.betaconceptframework.astroboa.api.model.io.ImportConfiguration.PersistMode;
>>>>>>> 231bac1b004c8d38f89320b5db3a097b6fecf54a
import org.betaconceptframework.astroboa.api.model.query.criteria.CmsCriteria.SearchMode;
import org.betaconceptframework.astroboa.api.model.query.criteria.ContentObjectCriteria;
import org.betaconceptframework.astroboa.api.model.query.criteria.RepositoryUserCriteria;

Solution content
import org.betaconceptframework.astroboa.api.model.Taxonomy; import org.betaconceptframework.astroboa.api.model.definition.Localization; import org.betaconceptframework.astroboa.api.model.exception.CmsException; import org.betaconceptframework.astroboa.api.model.query.Order; import org.betaconceptframework.astroboa.api.model.io.ImportConfiguration; import org.betaconceptframework.astroboa.api.model.io.ImportConfiguration.PersistMode; import org.betaconceptframework.astroboa.api.model.query.criteria.CmsCriteria.SearchMode; import org.betaconceptframework.astroboa.api.model.query.criteria.ContentObjectCriteria; import org.betaconceptframework.astroboa.api.model.query.criteria.RepositoryUserCriteria;

Solution content

import org.betaconceptframework.astroboa.api.model.Taxonomy;
import org.betaconceptframework.astroboa.api.model.definition.Localization;
import org.betaconceptframework.astroboa.api.model.exception.CmsException;
import org.betaconceptframework.astroboa.api.model.query.Order;
import org.betaconceptframework.astroboa.api.model.io.ImportConfiguration;
import org.betaconceptframework.astroboa.api.model.io.ImportConfiguration.PersistMode;
import org.betaconceptframework.astroboa.api.model.query.criteria.CmsCriteria.SearchMode;
import org.betaconceptframework.astroboa.api.model.query.criteria.ContentObjectCriteria;
import org.betaconceptframework.astroboa.api.model.query.criteria.RepositoryUserCriteria;

File
RepositoryUserDao.java

Developer's decision
Concatenation

Kind of conflict
Import

Chunk

Conflicting content
} public static void addBinaryProperty(SaveMode saveMode, Node node, ItemQName propertyName, byte[] value, ValueFactory valueFactory) throws RepositoryException { <<<<<<< HEAD if (value != null) { Value binary = JcrValueUtils.getJcrBinary(value, valueFactory); node.setProperty(propertyName.getJcrName(), binary); if (binary !=null){ binary.getBinary().dispose(); } } else if (saveMode == SaveMode.UPDATE_ALL) ======= if (value != null) node.setProperty(propertyName.getJcrName(), JcrValueUtils.getJcrBinary(value, valueFactory)); else if (saveMode == SaveMode.UPDATE) >>>>>>> 231bac1b004c8d38f89320b5db3a097b6fecf54a removeProperty(node, propertyName, false); }

Conflicting content

	}

	public static void addBinaryProperty(SaveMode saveMode, Node node, ItemQName propertyName, byte[] value, ValueFactory valueFactory) throws  RepositoryException {
<<<<<<< HEAD
		if (value != null) {
			Value binary = JcrValueUtils.getJcrBinary(value, valueFactory);
			node.setProperty(propertyName.getJcrName(), binary);
			
			if (binary !=null){
				binary.getBinary().dispose();
			}
		} else if (saveMode == SaveMode.UPDATE_ALL)
=======
		if (value != null)
			node.setProperty(propertyName.getJcrName(), JcrValueUtils.getJcrBinary(value, valueFactory));
		else if (saveMode == SaveMode.UPDATE)
>>>>>>> 231bac1b004c8d38f89320b5db3a097b6fecf54a
			removeProperty(node, propertyName, false);
		
	}

Solution content
} public static void addBinaryProperty(SaveMode saveMode, Node node, ItemQName propertyName, byte[] value, ValueFactory valueFactory) throws RepositoryException { if (value != null) { Value binary = JcrValueUtils.getJcrBinary(value, valueFactory); node.setProperty(propertyName.getJcrName(), binary); if (binary !=null){ binary.getBinary().dispose(); } } else if (saveMode == SaveMode.UPDATE){ removeProperty(node, propertyName, false); } }

Solution content

	}

	public static void addBinaryProperty(SaveMode saveMode, Node node, ItemQName propertyName, byte[] value, ValueFactory valueFactory) throws  RepositoryException {
		if (value != null) {
			Value binary = JcrValueUtils.getJcrBinary(value, valueFactory);
			node.setProperty(propertyName.getJcrName(), binary);
			
			if (binary !=null){
				binary.getBinary().dispose();
			}
		} else if (saveMode == SaveMode.UPDATE){
			removeProperty(node, propertyName, false);
		}
		
	}

File
JcrNodeUtils.java

Developer's decision
Manual

Kind of conflict
If statement
Method invocation
Variable

Chunk

Conflicting content
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. <<<<<<< HEAD // Generated on: 2012.01.06 at 11:49:26 πμ EET ======= // Generated on: 2011.10.31 at 01:02:45 PM EET >>>>>>> 231bac1b004c8d38f89320b5db3a097b6fecf54a //

Conflicting content

// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
// See http://java.sun.com/xml/jaxb 
// Any modifications to this file will be lost upon recompilation of the source schema. 
<<<<<<< HEAD
// Generated on: 2012.01.06 at 11:49:26 πμ EET 
=======
// Generated on: 2011.10.31 at 01:02:45 PM EET 
>>>>>>> 231bac1b004c8d38f89320b5db3a097b6fecf54a
//

Solution content
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. // Generated on: 2012.01.06 at 11:49:26 πμ EET //

Solution content

// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
// See http://java.sun.com/xml/jaxb 
// Any modifications to this file will be lost upon recompilation of the source schema. 
// Generated on: 2012.01.06 at 11:49:26 πμ EET 
//

File
JcrCacheType.java

Developer's decision
Version 1

Kind of conflict
Comment

Chunk

Conflicting content
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. <<<<<<< HEAD // Generated on: 2012.01.06 at 11:49:26 πμ EET ======= // Generated on: 2011.10.31 at 01:02:45 PM EET >>>>>>> 231bac1b004c8d38f89320b5db3a097b6fecf54a //

Conflicting content

// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
// See http://java.sun.com/xml/jaxb 
// Any modifications to this file will be lost upon recompilation of the source schema. 
<<<<<<< HEAD
// Generated on: 2012.01.06 at 11:49:26 πμ EET 
=======
// Generated on: 2011.10.31 at 01:02:45 PM EET 
>>>>>>> 231bac1b004c8d38f89320b5db3a097b6fecf54a
//

Solution content
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. // Generated on: 2012.01.06 at 11:49:26 πμ EET //

Solution content

// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
// See http://java.sun.com/xml/jaxb 
// Any modifications to this file will be lost upon recompilation of the source schema. 
// Generated on: 2012.01.06 at 11:49:26 πμ EET 
//

File
LocalizationType.java

Developer's decision
Version 1

Kind of conflict
Comment

Chunk

Conflicting content
// Generated on: 2012.01.06 at 11:49:26 πμ EET // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. <<<<<<< HEAD ======= // Generated on: 2011.10.31 at 01:02:45 PM EET >>>>>>> 231bac1b004c8d38f89320b5db3a097b6fecf54a //

Conflicting content

// Generated on: 2012.01.06 at 11:49:26 πμ EET 
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
// See http://java.sun.com/xml/jaxb 
// Any modifications to this file will be lost upon recompilation of the source schema. 
<<<<<<< HEAD
=======
// Generated on: 2011.10.31 at 01:02:45 PM EET 
>>>>>>> 231bac1b004c8d38f89320b5db3a097b6fecf54a
//

Solution content
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. // Generated on: 2012.01.06 at 11:49:26 πμ EET //

Solution content

// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
// See http://java.sun.com/xml/jaxb 
// Any modifications to this file will be lost upon recompilation of the source schema. 
// Generated on: 2012.01.06 at 11:49:26 πμ EET 
//

File
ObjectFactory.java

Developer's decision
Version 1

Kind of conflict
Comment

Chunk

Conflicting content
} /** <<<<<<< HEAD * Create an instance of {@link SecurityType.SecretUserKeyList } * / public SecurityType.SecretUserKeyList createSecurityTypeSecretUserKeyList() { return new SecurityType.SecretUserKeyList(); } /* * Create an instance of {@link LocalizationType } * / public LocalizationType createLocalizationType() { return new LocalizationType(); } /* * Create an instance of {@link SecurityType.SecretUserKeyList.SecretUserKey } * / public SecurityType.SecretUserKeyList.SecretUserKey createSecurityTypeSecretUserKeyListSecretUserKey() { return new SecurityType.SecretUserKeyList.SecretUserKey(); } /* * Create an instance of {@link SecurityType.PermanentUserKeyList.PermanentUserKey } * / public SecurityType.PermanentUserKeyList.PermanentUserKey createSecurityTypePermanentUserKeyListPermanentUserKey() { return new SecurityType.PermanentUserKeyList.PermanentUserKey(); ======= Create an instance of {@link LocalizationType } * / public LocalizationType createLocalizationType() { return new LocalizationType(); } /* * Create an instance of {@link SecurityType } * / public SecurityType createSecurityType() { return new SecurityType(); >>>>>>> 231bac1b004c8d38f89320b5db3a097b6fecf54a } /*

Conflicting content

    }

    /**
<<<<<<< HEAD
     * Create an instance of {@link SecurityType.SecretUserKeyList }
     * 
     */
    public SecurityType.SecretUserKeyList createSecurityTypeSecretUserKeyList() {
        return new SecurityType.SecretUserKeyList();
    }

    /**
     * Create an instance of {@link LocalizationType }
     * 
     */
    public LocalizationType createLocalizationType() {
        return new LocalizationType();
    }

    /**
     * Create an instance of {@link SecurityType.SecretUserKeyList.SecretUserKey }
     * 
     */
    public SecurityType.SecretUserKeyList.SecretUserKey createSecurityTypeSecretUserKeyListSecretUserKey() {
        return new SecurityType.SecretUserKeyList.SecretUserKey();
    }

    /**
     * Create an instance of {@link SecurityType.PermanentUserKeyList.PermanentUserKey }
     * 
     */
    public SecurityType.PermanentUserKeyList.PermanentUserKey createSecurityTypePermanentUserKeyListPermanentUserKey() {
        return new SecurityType.PermanentUserKeyList.PermanentUserKey();
=======
     * Create an instance of {@link LocalizationType }
     * 
     */
    public LocalizationType createLocalizationType() {
        return new LocalizationType();
    }

    /**
     * Create an instance of {@link SecurityType }
     * 
     */
    public SecurityType createSecurityType() {
        return new SecurityType();
>>>>>>> 231bac1b004c8d38f89320b5db3a097b6fecf54a
    }

    /**

Solution content
} } /** <<<<<<< HEAD * Create an instance of {@link SecurityType.SecretUserKeyList } * / public SecurityType.SecretUserKeyList createSecurityTypeSecretUserKeyList() { return new SecurityType.SecretUserKeyList(); } /* * Create an instance of {@link LocalizationType } * / public LocalizationType createLocalizationType() { return new LocalizationType(); } /* * Create an instance of {@link SecurityType.SecretUserKeyList.SecretUserKey } * / public SecurityType.SecretUserKeyList.SecretUserKey createSecurityTypeSecretUserKeyListSecretUserKey() { return new SecurityType.SecretUserKeyList.SecretUserKey(); } /* * Create an instance of {@link SecurityType.PermanentUserKeyList.PermanentUserKey } * / public SecurityType.PermanentUserKeyList.PermanentUserKey createSecurityTypePermanentUserKeyListPermanentUserKey() { return new SecurityType.PermanentUserKeyList.PermanentUserKey(); ======= Create an instance of {@link LocalizationType } * / public LocalizationType createLocalizationType() { return new LocalizationType(); } /* * Create an instance of {@link SecurityType } * / public SecurityType createSecurityType() { return new SecurityType(); >>>>>>> master /*

Solution content

    }

    }

    /**
<<<<<<< HEAD
     * Create an instance of {@link SecurityType.SecretUserKeyList }
     * 
     */
    public SecurityType.SecretUserKeyList createSecurityTypeSecretUserKeyList() {
        return new SecurityType.SecretUserKeyList();
    }

    /**
     * Create an instance of {@link LocalizationType }
     * 
     */
    public LocalizationType createLocalizationType() {
        return new LocalizationType();
    }

    /**
     * Create an instance of {@link SecurityType.SecretUserKeyList.SecretUserKey }
     * 
     */
    public SecurityType.SecretUserKeyList.SecretUserKey createSecurityTypeSecretUserKeyListSecretUserKey() {
        return new SecurityType.SecretUserKeyList.SecretUserKey();
    }

    /**
     * Create an instance of {@link SecurityType.PermanentUserKeyList.PermanentUserKey }
     * 
     */
    public SecurityType.PermanentUserKeyList.PermanentUserKey createSecurityTypePermanentUserKeyListPermanentUserKey() {
        return new SecurityType.PermanentUserKeyList.PermanentUserKey();
=======
     * Create an instance of {@link LocalizationType }
     * 
     */
    public LocalizationType createLocalizationType() {
        return new LocalizationType();
    }

    /**
     * Create an instance of {@link SecurityType }
     * 
     */
    public SecurityType createSecurityType() {
        return new SecurityType();
>>>>>>> master
    /**

File
ObjectFactory.java

Developer's decision
Manual

Kind of conflict
Comment
Method declaration
Method invocation
Method signature
Return statement

Chunk

Conflicting content
} /** <<<<<<< HEAD ======= * Create an instance of {@link Repositories } * / public Repositories createRepositories() { return new Repositories(); } /* >>>>>>> 231bac1b004c8d38f89320b5db3a097b6fecf54a * Create an instance of {@link RepositoryType } * */

Conflicting content

    }

    /**
<<<<<<< HEAD
=======
     * Create an instance of {@link Repositories }
     * 
     */
    public Repositories createRepositories() {
        return new Repositories();
    }

    /**
>>>>>>> 231bac1b004c8d38f89320b5db3a097b6fecf54a
     * Create an instance of {@link RepositoryType }
     * 
     */

Solution content
} /** <<<<<<< HEAD ======= * Create an instance of {@link Repositories } * / public Repositories createRepositories() { return new Repositories(); } /* >>>>>>> master * Create an instance of {@link RepositoryType } * */

Solution content

    }

    /**
<<<<<<< HEAD
=======
     * Create an instance of {@link Repositories }
     * 
     */
    public Repositories createRepositories() {
        return new Repositories();
    }

    /**
>>>>>>> master
     * Create an instance of {@link RepositoryType }
     * 
     */

File
ObjectFactory.java

Developer's decision
Manual

Kind of conflict
Comment
Method declaration

Chunk

Conflicting content
} /** <<<<<<< HEAD * Create an instance of {@link Repositories } * / public Repositories createRepositories() { return new Repositories(); ======= Create an instance of {@link JcrCacheType } * / public JcrCacheType createJcrCacheType() { return new JcrCacheType(); >>>>>>> 231bac1b004c8d38f89320b5db3a097b6fecf54a } /*

Conflicting content

    }

    /**
<<<<<<< HEAD
     * Create an instance of {@link Repositories }
     * 
     */
    public Repositories createRepositories() {
        return new Repositories();
=======
     * Create an instance of {@link JcrCacheType }
     * 
     */
    public JcrCacheType createJcrCacheType() {
        return new JcrCacheType();
>>>>>>> 231bac1b004c8d38f89320b5db3a097b6fecf54a
    }

    /**

Solution content
} /** <<<<<<< HEAD * Create an instance of {@link Repositories } * / public Repositories createRepositories() { return new Repositories(); ======= Create an instance of {@link JcrCacheType } * / public JcrCacheType createJcrCacheType() { return new JcrCacheType(); >>>>>>> master } /*

Solution content

    }

    /**
<<<<<<< HEAD
     * Create an instance of {@link Repositories }
     * 
     */
    public Repositories createRepositories() {
        return new Repositories();
=======
     * Create an instance of {@link JcrCacheType }
     * 
     */
    public JcrCacheType createJcrCacheType() {
        return new JcrCacheType();
>>>>>>> master
    }

    /**

File
ObjectFactory.java

Developer's decision
Manual

Kind of conflict
Comment
Method invocation
Method signature
Return statement

Chunk

Conflicting content
return new SecurityType.SecretUserKeyList.SecretUserKey(); } <<<<<<< HEAD ======= /** * Create an instance of {@link SecurityType.PermanentUserKeyList.PermanentUserKey } * */ public SecurityType.PermanentUserKeyList.PermanentUserKey createSecurityTypePermanentUserKeyListPermanentUserKey() { return new SecurityType.PermanentUserKeyList.PermanentUserKey(); } >>>>>>> 231bac1b004c8d38f89320b5db3a097b6fecf54a }

Conflicting content

        return new SecurityType.SecretUserKeyList.SecretUserKey();
    }

<<<<<<< HEAD
=======
    /**
     * Create an instance of {@link SecurityType.PermanentUserKeyList.PermanentUserKey }
     * 
     */
    public SecurityType.PermanentUserKeyList.PermanentUserKey createSecurityTypePermanentUserKeyListPermanentUserKey() {
        return new SecurityType.PermanentUserKeyList.PermanentUserKey();
    }

>>>>>>> 231bac1b004c8d38f89320b5db3a097b6fecf54a
}

Solution content

        return new SecurityType.SecretUserKeyList.SecretUserKey();
    }

<<<<<<< HEAD
=======
    /**
     * Create an instance of {@link SecurityType.PermanentUserKeyList.PermanentUserKey }
     * 
     */
    public SecurityType.PermanentUserKeyList.PermanentUserKey createSecurityTypePermanentUserKeyListPermanentUserKey() {
        return new SecurityType.PermanentUserKeyList.PermanentUserKey();
    }

>>>>>>> master
}

File
ObjectFactory.java

Developer's decision
Manual

Kind of conflict
Comment
Method declaration

Chunk

Conflicting content

// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
// See http://java.sun.com/xml/jaxb 
// Any modifications to this file will be lost upon recompilation of the source schema. 
<<<<<<< HEAD
// Generated on: 2012.01.06 at 11:49:26 πμ EET 
=======
// Generated on: 2011.10.31 at 01:02:45 PM EET 
>>>>>>> 231bac1b004c8d38f89320b5db3a097b6fecf54a
//

Solution content

// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
// See http://java.sun.com/xml/jaxb 
// Any modifications to this file will be lost upon recompilation of the source schema. 
// Generated on: 2012.01.06 at 11:49:26 πμ EET 
//

File
Repositories.java

Developer's decision
Version 1

Kind of conflict
Comment

Chunk

Conflicting content

// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
// See http://java.sun.com/xml/jaxb 
// Any modifications to this file will be lost upon recompilation of the source schema. 
<<<<<<< HEAD
// Generated on: 2012.01.06 at 11:49:26 πμ EET 
=======
// Generated on: 2011.10.31 at 01:02:45 PM EET 
>>>>>>> 231bac1b004c8d38f89320b5db3a097b6fecf54a
//

Solution content

// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
// See http://java.sun.com/xml/jaxb 
// Any modifications to this file will be lost upon recompilation of the source schema. 
// Generated on: 2012.01.06 at 11:49:26 πμ EET 
//

File
RepositoryType.java

Developer's decision
Version 1

Kind of conflict
Comment

Chunk

Conflicting content

// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
// See http://java.sun.com/xml/jaxb 
// Any modifications to this file will be lost upon recompilation of the source schema. 
<<<<<<< HEAD
// Generated on: 2012.01.06 at 11:49:26 πμ EET 
=======
// Generated on: 2011.10.31 at 01:02:45 PM EET 
>>>>>>> 231bac1b004c8d38f89320b5db3a097b6fecf54a
//

Solution content

// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
// See http://java.sun.com/xml/jaxb 
// Any modifications to this file will be lost upon recompilation of the source schema. 
// Generated on: 2012.01.06 at 11:49:26 πμ EET 
//

File
SecurityType.java

Developer's decision
Version 1

Kind of conflict
Comment

Chunk

Conflicting content

// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
// See http://java.sun.com/xml/jaxb 
// Any modifications to this file will be lost upon recompilation of the source schema. 
<<<<<<< HEAD
// Generated on: 2012.01.06 at 11:49:26 πμ EET 
=======
// Generated on: 2011.10.31 at 01:02:45 PM EET 
>>>>>>> 231bac1b004c8d38f89320b5db3a097b6fecf54a
//

@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.betaconceptframework.org/schema/astroboa/configuration/repositories")

Solution content

// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
// See http://java.sun.com/xml/jaxb 
// Any modifications to this file will be lost upon recompilation of the source schema. 
// Generated on: 2012.01.06 at 11:49:26 πμ EET 
//

@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.betaconceptframework.org/schema/astroboa/configuration/repositories")

File
package-info.java

Developer's decision
Version 1

Kind of conflict
Comment

Chunk

Conflicting content

	public static final String DEPRECATED_RESOURCE_API_MODELS_COLLECTION_URI_PATH = CmsConstants.FORWARD_SLASH+"model";
	public static final String RESOURCE_API_ENCRYPTION_UTILITY_URI_PATH = CmsConstants.FORWARD_SLASH+"encrypt";

<<<<<<< HEAD
	public static final String ASTROBOA_CONFIGURATION_HOME_DIRECTORY_SYSTEM_PROPERTY_NAME = "org.betaconceptframework.astroboa.configuration.dir";
	public static final String ASTROBOA_CONFIGURATION_HOME_DIRECTORY = System.getProperty(ASTROBOA_CONFIGURATION_HOME_DIRECTORY_SYSTEM_PROPERTY_NAME);
=======
	public static final String NAME_OF_PROPERTY_REPRESENTING_SIMPLE_CONTENT = "value";
	/**
	 * Use {@link #RESOURCE_API_CONTENT_URI_PATH} instead
	 */
	@Deprecated
	public static final String DEPRECATED_RESOURCE_API_CONTENT_URI_PATH = "contentObject";

	/**
	 * Use {@link #RESOURCE_API_TAXONOMY_URI_PATH} instead
	 */
	@Deprecated
	public static final String DEPRECATED_RESOURCE_API_TAXONOMY_URI_PATH = "taxonomy";
	
	/**
	/*
	 * The lexical representation of year object CCYY
	 * Use {@link #RESOURCE_API_TOPIC_URI_PATH} instead
	 */
	@Deprecated
	public static final String DEPRECATED_RESOURCE_API_TOPIC_URI_PATH = "topic";

	/**
	 * Use {@link #RESOURCE_API_MODEL_URI_PATH} instead
	 */
	@Deprecated
	public static final String DEPRECATED_RESOURCE_API_MODEL_URI_PATH = "model";

	
	public static final String EXCHANGE_NAME = "AstroboaExchange";
	
	/*
	 * Regular expression for the pattern of the values of an element
	 * of type {http://www.w3.org/2001/XMLSchema.xsd}language (xml:lang)
	 */
	public static final String XML_SCHEMA_LANGUAGE_TYPE_REG_EXP = "[a-zA-Z]{1,8}(-[a-zA-Z0-9]{1,8})*";
	
	/*
	 * ISO 8601 regular expressions for XML Schema types
	 * gYear, gMonth, gYearMonth, gDay, gMonthDay
	 */
	public static final String TIME_ZONE_REG_EXP = "Z|[+-](?:2[0-3]|[01]?[0-9])(?::?(?:[0-5]?[0-9]))?";
	public static final String YEAR_REG_EXP = "\\d{4}";
	public static final String MONTH_REG_EXP = "1[0-2]|0[1-9]";
	public static final String DAY_REG_EXP = "3[0-1]|0[1-9]|[1-2][0-9]";
	
     * with possible time zone Z or (-),(+)hh:mm
	 */
	public static final String GYEAR_REG_EXP = YEAR_REG_EXP+"("+TIME_ZONE_REG_EXP+")?";
	
	/*	The lexical representation of gMonth object --MM
	 *      with possible time zone Z or (-),(+)hh:mm
	 */
	public static final String GMONTH_REG_EXP = "--("+MONTH_REG_EXP+")("+TIME_ZONE_REG_EXP+")?";

	/*	The lexical representation of gYearMonth object CCYY-MM
	 *      with possible time zone Z or (-),(+)hh:mm
	 */
	public static final String GYEAR_MONTH_REG_EXP = YEAR_REG_EXP+"-("+MONTH_REG_EXP+")("+TIME_ZONE_REG_EXP+")?";

	/*	The lexical representation of gDay object ---DD
	 *      with possible time zone Z or (-),(+)hh:mm
	 */
	public static final String GDAY_REG_EXP = "---("+DAY_REG_EXP+")("+TIME_ZONE_REG_EXP+")?";

	/*	The lexical representation of gMonthDay object --MM-DD
	 *      with possible time zone Z or (-),(+)hh:mm
	 */
	public static final String GMONTH_DAY_REG_EXP = "--("+MONTH_REG_EXP+")-("+DAY_REG_EXP+")("+TIME_ZONE_REG_EXP+")?";
>>>>>>> 231bac1b004c8d38f89320b5db3a097b6fecf54a

}

Solution content

	public static final String DEPRECATED_RESOURCE_API_MODELS_COLLECTION_URI_PATH = CmsConstants.FORWARD_SLASH+"model";
	public static final String RESOURCE_API_ENCRYPTION_UTILITY_URI_PATH = CmsConstants.FORWARD_SLASH+"encrypt";

	/**
	 * Use {@link #RESOURCE_API_CONTENT_URI_PATH} instead
	 */
	@Deprecated
	public static final String DEPRECATED_RESOURCE_API_CONTENT_URI_PATH = "contentObject";

	/**
	 * Use {@link #RESOURCE_API_TAXONOMY_URI_PATH} instead
	 */
	@Deprecated
	public static final String DEPRECATED_RESOURCE_API_TAXONOMY_URI_PATH = "taxonomy";
	
	/**
	 * Use {@link #RESOURCE_API_TOPIC_URI_PATH} instead
	 */
	@Deprecated
	public static final String DEPRECATED_RESOURCE_API_TOPIC_URI_PATH = "topic";

	/**
	 * Use {@link #RESOURCE_API_MODEL_URI_PATH} instead
	 */
	@Deprecated
	public static final String DEPRECATED_RESOURCE_API_MODEL_URI_PATH = "model";

	
	public static final String EXCHANGE_NAME = "AstroboaExchange";
	
	/*
	 * Regular expression for the pattern of the values of an element
	 * of type {http://www.w3.org/2001/XMLSchema.xsd}language (xml:lang)
	 */
	public static final String XML_SCHEMA_LANGUAGE_TYPE_REG_EXP = "[a-zA-Z]{1,8}(-[a-zA-Z0-9]{1,8})*";
	
	/*
	 * ISO 8601 regular expressions for XML Schema types
	 * gYear, gMonth, gYearMonth, gDay, gMonthDay
	 */
	public static final String TIME_ZONE_REG_EXP = "Z|[+-](?:2[0-3]|[01]?[0-9])(?::?(?:[0-5]?[0-9]))?";
	public static final String YEAR_REG_EXP = "\\d{4}";
	public static final String MONTH_REG_EXP = "1[0-2]|0[1-9]";
	public static final String DAY_REG_EXP = "3[0-1]|0[1-9]|[1-2][0-9]";
	
	/*
	 * The lexical representation of year object CCYY
     * with possible time zone Z or (-),(+)hh:mm
	 */
	public static final String GYEAR_REG_EXP = YEAR_REG_EXP+"("+TIME_ZONE_REG_EXP+")?";
	
	/*	The lexical representation of gMonth object --MM
	 *      with possible time zone Z or (-),(+)hh:mm
	 */
	public static final String GMONTH_REG_EXP = "--("+MONTH_REG_EXP+")("+TIME_ZONE_REG_EXP+")?";

	/*	The lexical representation of gYearMonth object CCYY-MM
	 *      with possible time zone Z or (-),(+)hh:mm
	 */
	public static final String GYEAR_MONTH_REG_EXP = YEAR_REG_EXP+"-("+MONTH_REG_EXP+")("+TIME_ZONE_REG_EXP+")?";

	/*	The lexical representation of gDay object ---DD
	 *      with possible time zone Z or (-),(+)hh:mm
	 */
	public static final String GDAY_REG_EXP = "---("+DAY_REG_EXP+")("+TIME_ZONE_REG_EXP+")?";

	/*	The lexical representation of gMonthDay object --MM-DD
	 *      with possible time zone Z or (-),(+)hh:mm
	 */
	public static final String GMONTH_DAY_REG_EXP = "--("+MONTH_REG_EXP+")-("+DAY_REG_EXP+")("+TIME_ZONE_REG_EXP+")?";

	public static final String NAME_OF_PROPERTY_REPRESENTING_SIMPLE_CONTENT = "value";


}

File
CmsConstants.java

Developer's decision
Combination

Kind of conflict
Annotation
Attribute
Comment
Method invocation

Projects >> astroboa >>3dab223bd71e9fea54807bafba92540f4f3af203