search

Northteq / Creekridge_Portal

Contains the code for the Creekridge Capital portal.
0 stars 1 forks source link

readme

Creekridge_Portal

Contains the code for the Creekridge Capital portal.

Instructions:

  1. Delete the folder with current creek ridge portlets if any in sdk/portlets
  2. Open command line (Windows key + R and type cmd)
  3. Navigate to the {liferay sdk folder}/portlets
  4. Execute git clone https://github.com/TamarackConsulting/Creekridge_Portal.git CreekRidgeCapital-portlet This should create a folder in portlets.
  5. Open Eclipse and create new Liferay project from existing source.
  6. Run ANT clean and ANT compile targets.
  7. If you are having issues, go to service.xml and right click > Liferay > Build Services (do NOT build WSSD!)

Alternative to steps 2-4 using Eclipse:

Note: Steps 2-4 from above can also be done from Eclipse using the following steps:

  1. From Eclipse, click on File > Import
  2. From the import screen, click on Git > "Projects from Git" > Click Next
  3. From the "Import Projects from Git" screen, click on Clone URI.
  4. From the "Source Repository" screen, in the URI paste in "https://github.com/TamarackConsulting/Creekridge_Portal.git". You can choose to enter a username and password but it's in a public repository so it isn't necessary. Click Next.
  5. From the "Branch Selection" screen, select "Master" only and click Next
  6. From the Local Destination screen, in the Directory field, browse to the {liferay sdk folder}/portlets folder and in the browse file name field enter "CreekRidgeCapital-portlet" and click Save
  7. Configure the remote github with a name at the bottom of the screen and click next.
  8. On the next screen, choose to Import projects from Existing and navigate to the CreekridgeCapital-portlet folder in the sdk\portlets folder.
  9. The project will be created with all contents from github.
  10. Do steps 6 and 7 listed above.

9 steps instead of 3 for those of us who feel safer with the Eclipse GUI :)

+++++++++++++++++++++++++++++++++++++++++++

PLEASE WATCH OUT FOR WHAT YOU ARE MERGING!

Steps to follow when you are ready to push your code:

  1. Commit the files in which you've made modifications in your local repository.
  2. Right click your project in Eclipse, Team > Synchronize Workspace
  3. The Team Synchronizing screen will appear showing the files in which there are differences between the remote repository and your local repository.
  4. Right click > "Overwrite" for local files that are unrelated to the files you are working on.
  5. For files you are working on that have conflicts, right click > "Merge" and carefully merge your code with the remote file.
  6. Right click on the project and click "Add to Index"
  7. Click on the "Pull" icon.
  8. The remote files should now be in your local repository.
  9. Commit code to your local repository for files you have modified.
  10. Push to github