Develop a project with two names?

I am developing an open source project that is intended for both a company under one name and a community under a different name. I would like to be able to easily transfer changes from one to another, but the name and license are different, so I do not know how to easily apply modifications from one to another. Here is an example:

ProjectOne :
file : src/main/projectone.main :
-> /** This file is part of ProjectOne... **/
-> contentA

ProjectTwo :
file : src/main/projecttwo.main :
-> /** This file is part of ProjectTwo... **/
-> contentA

Now think that I am modifying the contents of projectTwo:

contentA -> contentB

I get:

ProjectOne :
file : src/main/projectone.main :
-> /** This file is part of ProjectOne... **/
-> contentA

ProjectTwo :
file : src/main/projecttwo.main :
-> /** This file is part of ProjectTwo... **/
-> contentB

I would like to be able to easily modify ProjectOne, but keeping my own license, package and project name ...

ProjectOne :
file : src/main/projectone.main :
-> /** This file is part of ProjectOne... **/
-> contentB

ProjectTwo :
file : src/main/projecttwo.main :
-> /** This file is part of ProjectTwo... **/
-> contentB

My project uses Maven for dependencies, Netbeans as an IDE, and git for version control. Is there a trick (branch, plugin ...) that could help me?

+4
3

, , / . script, / .

+1

()

: :

       1. Proj1 
       2. Proj2

content, . , i.e.

       content / proj1 / license.htm
               / proj2 / license.htm

, , , proj1 proj2. , , . , , , proj1 proj2, , .

, .

0

script, / .

0

All Articles